golang December 2014

golang@lists.fedoraproject.org

9 participants
334 discussions

[Bug 1169035] New: Docker-io-1.3.2 needs device-mapper-libs-1.02.90 but in fact it is not in Fedora 20 repository
by Red Hat Bugzilla 05 Dec '14

05 Dec '14

https://bugzilla.redhat.com/show_bug.cgi?id=1169035 Bug ID: 1169035 Summary: Docker-io-1.3.2 needs device-mapper-libs-1.02.90 but in fact it is not in Fedora 20 repository Product: Fedora Version: 20 Component: docker-io Assignee: lsm5(a)fedoraproject.org Reporter: liangsuilong(a)gmail.com QA Contact: extras-qa(a)fedoraproject.org CC: admiller(a)redhat.com, golang(a)lists.fedoraproject.org, hushan.jia(a)gmail.com, jchaloup(a)redhat.com, jperrin(a)centos.org, lsm5(a)fedoraproject.org, mattdm(a)redhat.com, mgoldman(a)redhat.com, miminar(a)redhat.com, s(a)shk.io, thrcka(a)redhat.com, vbatts(a)redhat.com Description of problem: Docker-io-1.3.2 needs device-mapper-libs-1.02.90 but in fact it is not in Fedora 20 repository. Version-Release number of selected component (if applicable): docker-io-1.3.2-2.fc20.x86_64 How reproducible: Just need to run yum update command. Steps to Reproduce: 1. Enable update-testing repo. 2. Run yum update command. Actual results: [fedora@fedora-laptop edo_console]$ sudo yum update [sudo] password for fedora: Loaded plugins: langpacks, refresh-packagekit Resolving Dependencies --> Running transaction check ---> Package docker-io.x86_64 0:1.3.1-2.fc20 will be updated ---> Package docker-io.x86_64 0:1.3.2-2.fc20 will be an update --> Processing Dependency: device-mapper-libs >= 1.02.90-1 for package: docker-io-1.3.2-2.fc20.x86_64 ---> Package sqlite.i686 0:3.8.7-1.fc20 will be updated ---> Package sqlite.x86_64 0:3.8.7-1.fc20 will be updated ---> Package sqlite.i686 0:3.8.7.2-1.fc20 will be an update ---> Package sqlite.x86_64 0:3.8.7.2-1.fc20 will be an update --> Finished Dependency Resolution Error: Package: docker-io-1.3.2-2.fc20.x86_64 (updates-testing) Requires: device-mapper-libs >= 1.02.90-1 Installed: device-mapper-libs-1.02.85-1.fc20.x86_64 (@updates) device-mapper-libs = 1.02.85-1.fc20 Available: device-mapper-libs-1.02.82-3.fc20.i686 (fedora) device-mapper-libs = 1.02.82-3.fc20 You could try using --skip-broken to work around the problem You could try running: rpm -Va --nofiles --nodigest In fact, the older docker-io package. docker-io-1.3.2-1.fc20.x86_64, has the same problem in Fedora 20. -- You are receiving this mail because: You are on the CC list for the bug.

1 8

[cadvisor] include git in BuildRequires
by Eric Paris 05 Dec '14

05 Dec '14

1 0

[cadvisor] Bump to upstream 89088df70eca64cf9d6b9a23a3d2bc21a30916d6
by Eric Paris 05 Dec '14

05 Dec '14

commit fc3b8db50b440a78e9164db1c1c5acde8496396c Author: Eric Paris <eparis(a)redhat.com> Date: Fri Dec 5 19:09:17 2014 -0500 Bump to upstream 89088df70eca64cf9d6b9a23a3d2bc21a30916d6 .gitignore | 1 + 0001-support-the-new-libcontiner.patch | 53 ++++++++++++++ add-chglog | 117 ++++++++++++++++++++++++++++++++ cadvisor.spec | 16 +++-- getsource.sh | 50 ++++++++++++++ sources | 2 +- 6 files changed, 233 insertions(+), 6 deletions(-) --- diff --git a/.gitignore b/.gitignore index 63f88a7..8fe634f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ clog /cadvisor-6906a8c.tar.gz /cadvisor-8c4f650.tar.gz +/cadvisor-89088df.tar.gz diff --git a/0001-support-the-new-libcontiner.patch b/0001-support-the-new-libcontiner.patch new file mode 100644 index 0000000..91b4694 --- /dev/null +++ b/0001-support-the-new-libcontiner.patch @@ -0,0 +1,53 @@ +From 22c88d96b0a9e80cf6ec5e538963d17b6d350443 Mon Sep 17 00:00:00 2001 +From: Eric Paris <eparis(a)redhat.com> +Date: Fri, 5 Dec 2014 19:02:44 -0500 +Subject: [PATCH] "support" the new libcontiner + +--- + container/libcontainer/helpers.go | 10 +--------- + container/raw/handler.go | 1 - + 2 files changed, 1 insertion(+), 10 deletions(-) + +diff --git a/container/libcontainer/helpers.go b/container/libcontainer/helpers.go +index 2d28e6f..156bbce 100644 +--- a/container/libcontainer/helpers.go ++++ b/container/libcontainer/helpers.go +@@ -30,7 +30,7 @@ func GetStats(cgroup *cgroups.Cgroup, state *libcontainer.State) (*info.Containe + stats := &libcontainer.ContainerStats{} + + var err error +- stats.CgroupStats, err = cgroupfs.GetStats(cgroup) ++ stats.CgroupStats, err = cgroupfs.GetStats(state.CgroupPaths) + if err != nil { + return &info.ContainerStats{}, err + } +@@ -39,14 +39,6 @@ func GetStats(cgroup *cgroups.Cgroup, state *libcontainer.State) (*info.Containe + return toContainerStats(stats), nil + } + +-func GetStatsCgroupOnly(cgroup *cgroups.Cgroup) (*info.ContainerStats, error) { +- s, err := cgroupfs.GetStats(cgroup) +- if err != nil { +- return nil, err +- } +- return toContainerStats(&libcontainer.ContainerStats{CgroupStats: s}), nil +-} +- + func DiskStatsCopy(blkio_stats []cgroups.BlkioStatEntry) (stat []info.PerDiskStats) { + if len(blkio_stats) == 0 { + return +diff --git a/container/raw/handler.go b/container/raw/handler.go +index 433a07b..1bc3d1f 100644 +--- a/container/raw/handler.go ++++ b/container/raw/handler.go +@@ -252,7 +252,6 @@ func (self *rawContainerHandler) GetStats() (*info.ContainerStats, error) { + NetworkState: network.NetworkState{ + VethHost: self.networkInterface.VethHost, + VethChild: self.networkInterface.VethChild, +- NsPath: "unknown", + }, + } + } +-- +1.9.3 + diff --git a/add-chglog b/add-chglog new file mode 100755 index 0000000..513026a --- /dev/null +++ b/add-chglog @@ -0,0 +1,117 @@ +#!/usr/bin/python -t +# -*- mode: Python; indent-tabs-mode: nil; coding: utf-8 -*- +# +# Copyright (c) 2005-2013 Fedora Project +# +# 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 re +import subprocess +import sys +import textwrap +import time +from optparse import OptionParser + + +__version__ = "1.0.12" + +class SpecFile: + def __init__(self, filename): + self.filename = filename + f = None + try: + f = open(filename,"r") + self.lines = f.readlines() + finally: + f and f.close() + + _changelog_pattern = re.compile(r"^%changelog(\s|$)", re.I) + + def addChangelogEntry(self, evr, entry, email): + for i in range(len(self.lines)): + if SpecFile._changelog_pattern.match(self.lines[i]): + if len(evr): + evrstring = ' - %s' % evr + else: + evrstring = '' + date = time.strftime("%a %b %d %Y", time.gmtime()) + newchangelogentry = "* %s %s%s\n%s\n\n" % \ + (date, email, evrstring, entry) + self.lines[i] += newchangelogentry + return + + def writeFile(self, filename): + f = open(filename, "w") + f.writelines(self.lines) + f.close() + + def debugdiff(self, old, new): + print ('%s\n-%s\n+%s\n' % (self.filename, old, new)) + +if __name__ == "__main__": + usage = '''Usage: %prog [OPTION]... SPECFILE...''' + + userstring = subprocess.Popen("rpmdev-packager 2>/dev/null", shell = True, + stdout = subprocess.PIPE).communicate()[0] + userstring = userstring.strip() or None + + parser = OptionParser(usage=usage) + parser.add_option("-c", "--comment", default='- rebuilt', + help="changelog comment (default: \"- rebuilt\")") + parser.add_option("-u", "--userstring", default=userstring, + help="user name+email string (default: output from "+ + "rpmdev-packager(1))") + (opts, args) = parser.parse_args() + + if not args: + parser.error('No specfiles specified') + + if not opts.userstring: + parser.error('Userstring required, see option -u') + + # Grab bullet, insert one if not found. + bullet_re = re.compile(r'^([^\s\w])\s', re.UNICODE) + bullet = "-" + match = bullet_re.search(opts.comment) + if match: + bullet = match.group(1) + else: + opts.comment = bullet + " " + opts.comment + + # Format comment. + if opts.comment.find("\n") == -1: + wrapopts = { "subsequent_indent": (len(bullet)+1) * " ", + "break_long_words": False } + if sys.version_info[:2] > (2, 5): + wrapopts["break_on_hyphens"] = False + opts.comment = textwrap.fill(opts.comment, 80, **wrapopts) + + for aspec in args: + try: + s = SpecFile(aspec) + except: + # Not actually a parser error, but... meh. + parser.error(sys.exc_info()[1]) + + # Get EVR for changelog entry. + cmd = ("rpm", "-q", "--specfile", "--define", "dist %{nil}", + "--qf=%|epoch?{%{epoch}:}:{}|%{version}-%{release}\n", aspec) + popen = subprocess.Popen(cmd, stdout = subprocess.PIPE) + evr = str(popen.communicate()[0]).split("\n")[0] + + s.addChangelogEntry(evr, opts.comment, opts.userstring) + s.writeFile(aspec) + +sys.exit(0) diff --git a/cadvisor.spec b/cadvisor.spec index 71e7847..0edcef7 100644 --- a/cadvisor.spec +++ b/cadvisor.spec @@ -2,14 +2,14 @@ %global provider_tld com %global project google %global repo cadvisor -%global commit 1e986029072ff511b0f069490d51dea35a50930e +%global commit 89088df70eca64cf9d6b9a23a3d2bc21a30916d6 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global debug_package %{nil} Name: %{repo} -Version: 0.6.0 +Version: 0.6.2 Release: 0.0.git%{shortcommit}%{?dist} Summary: Analyzes resource usage and performance characteristics of running containers License: ASL 2.0 @@ -17,6 +17,9 @@ URL: https://%{import_path} Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: cadvisor Source2: cadvisor.service + +Patch0: 0001-support-the-new-libcontiner.patch + BuildRequires: docker-io-pkg-devel BuildRequires: systemd BuildRequires: glibc-static @@ -132,7 +135,7 @@ can also be added. cAdvisor's container abstraction is based on lmctfy's so containers are inherently nested hierarchically. %prep -%setup -n %{name}-%{commit} -q +%autosetup -Sgit -n %{name}-%{commit} -q %build mkdir _build @@ -175,13 +178,13 @@ done %systemd_postun %files -%doc AUTHORS CHANGELOG.md CONTRIBUTING.md CONTRIBUTORS LICENSE README.md +%doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE README.md %{_bindir}/cadvisor %{_unitdir}/%{name}.service %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %files devel -%doc AUTHORS CHANGELOG.md CONTRIBUTING.md CONTRIBUTORS LICENSE README.md +%doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE README.md %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} %dir %{gopath}/src/%{import_path} %dir %{gopath}/src/%{import_path}/api @@ -208,6 +211,9 @@ done %{gopath}/src/%{import_path}/utils/* %changelog +* Fri Dec 05 2014 Eric Paris <eparis(a)redhat.com> - 0.6.2-0.0.git89088df +- Bump to upstream 89088df70eca64cf9d6b9a23a3d2bc21a30916d6 + * Fri Nov 14 2014 Eric Paris <eparis(a)redhat.com> - 0.6.0-0.0.git1e98602 - update to 0.6.0 diff --git a/getsource.sh b/getsource.sh new file mode 100755 index 0000000..869c470 --- /dev/null +++ b/getsource.sh @@ -0,0 +1,50 @@ +#!/bin/sh + +NAME=cadvisor +GIT_COMMIT="$1" +GIT_SHORT="${GIT_COMMIT:0:7}" +GIT_VERSION="$2" + +set -o errexit +set -o nounset +set -o pipefail +set -x + +SPEC="${NAME}.spec" + +curl -s -L https://github.com/google/${NAME}/archive/${GIT_COMMIT}.tar.gz > ${NAME}-${GIT_SHORT}.tar.gz + +if [[ "${GIT_VERSION}" =~ ^([0-9]+)\.([0-9]+)(\.)?([0-9]+)?(-.*)?$ ]]; then + git_major=${BASH_REMATCH[1]} + git_minor=${BASH_REMATCH[2]} + git_really_minor=${BASH_REMATCH[4]} + since_tag=${BASH_REMATCH[5]} +else + echo "Failed to parse version!" + /bin/false +fi + +if [[ "${since_tag}" =~ ^-([0-9]+)-.*$ ]]; then + since_tag=${BASH_REMATCH[1]} +else + since_tag=0 +fi + +version="${git_major}.${git_minor}" +if [[ -n ${git_really_minor} ]]; then + version="${version}.${git_really_minor}" +fi + +#put the git hash in as the commit +sed -i -e "s/%global commit\t\t[[:xdigit:]]\{40\}/%global commit\t\t${GIT_COMMIT}/" ${SPEC} +#update the version with the latest tag +sed -i -e "s/Version:\t[[:digit:]]\+\.[[:digit:]]\+$\.[[:digit:]]\+$\?/Version:\t${version}/" ${SPEC} +#update the release with since_tag +sed -i -e "s/Release:\t[[:digit:]]\+\.[[:digit:]]\+/Release:\t${since_tag}.0/" ${SPEC} + +#increment the version number +./add-chglog --comment="Bump to upstream ${GIT_COMMIT}" --userstring="Eric Paris <eparis(a)redhat.com>" ${SPEC} + +fedpkg clog + +echo "****Don't forget to run: fedpkg new-sources ${NAME}-${GIT_SHORT}.tar.gz" diff --git a/sources b/sources index 31ef9f8..6289238 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -620c545edda1d56dba9c28cb9eefc411 cadvisor-8c4f650.tar.gz +b92e4aba83bce32777763d03378e02f7 cadvisor-89088df.tar.gz

1 0

[cadvisor] fix gopath usage
by Eric Paris 05 Dec '14

05 Dec '14

commit a9f73146a5366534a44f7ed3bf2875c386ed1eb0 Author: Eric Paris <eparis(a)redhat.com> Date: Fri Dec 5 17:48:02 2014 -0500 fix gopath usage cadvisor.spec | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) --- diff --git a/cadvisor.spec b/cadvisor.spec index e0465d4..71e7847 100644 --- a/cadvisor.spec +++ b/cadvisor.spec @@ -5,7 +5,6 @@ %global commit 1e986029072ff511b0f069490d51dea35a50930e %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global gopath %{_datadir}/gocode %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global debug_package %{nil} @@ -142,7 +141,7 @@ pushd _build mkdir -p src/github.com/google ln -s $(dirs +1 -l) src/github.com/google/cadvisor popd -export GOPATH=$(pwd)/_build:%{buildroot}%{gopath}:%{gopath} +export GOPATH=$(pwd)/_build:%{gopath} go build --ldflags '-extldflags "-static"' github.com/google/cadvisor

1 0

[cadvisor] update to 0.6.0
by Eric Paris 05 Dec '14

05 Dec '14

commit 33713b3d52752ae96810ee4c947d32d9b972c16a Author: Eric Paris <eparis(a)redhat.com> Date: Tue Nov 18 00:00:09 2014 -0500 update to 0.6.0 cadvisor.spec | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) --- diff --git a/cadvisor.spec b/cadvisor.spec index 3028b24..e0465d4 100644 --- a/cadvisor.spec +++ b/cadvisor.spec @@ -2,7 +2,7 @@ %global provider_tld com %global project google %global repo cadvisor -%global commit 8c4f650e62f096710da794e536de86e34447fca9 +%global commit 1e986029072ff511b0f069490d51dea35a50930e %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global gopath %{_datadir}/gocode @@ -10,7 +10,7 @@ %global debug_package %{nil} Name: %{repo} -Version: 0.5.0 +Version: 0.6.0 Release: 0.0.git%{shortcommit}%{?dist} Summary: Analyzes resource usage and performance characteristics of running containers License: ASL 2.0 @@ -68,8 +68,6 @@ so containers are inherently nested hierarchically. Requires: golang Summary: Analyzes resource usage and performance characteristics of running containers Provides: golang(%{import_path}) = %{version}-%{release} -Provides: golang(%{import_path}/advice) = %{version}-%{release} -Provides: golang(%{import_path}/advice/interface) = %{version}-%{release} Provides: golang(%{import_path}/api) = %{version}-%{release} Provides: golang(%{import_path}/client) = %{version}-%{release} Provides: golang(%{import_path}/container) = %{version}-%{release} @@ -77,16 +75,21 @@ Provides: golang(%{import_path}/container/docker) = %{version}-%{release} Provides: golang(%{import_path}/container/libcontainer) = %{version}-%{release} Provides: golang(%{import_path}/container/raw) = %{version}-%{release} Provides: golang(%{import_path}/deploy) = %{version}-%{release} +Provides: golang(%{import_path}/fs) = %{version}-%{release} +Provides: golang(%{import_path}/healthz) = %{version}-%{release} Provides: golang(%{import_path}/info) = %{version}-%{release} Provides: golang(%{import_path}/manager) = %{version}-%{release} Provides: golang(%{import_path}/pages) = %{version}-%{release} Provides: golang(%{import_path}/pages/static) = %{version}-%{release} -Provides: golang(%{import_path}/sampling) = %{version}-%{release} Provides: golang(%{import_path}/storage) = %{version}-%{release} -Provides: golang(%{import_path}/storage/cache) = %{version}-%{release} +Provides: golang(%{import_path}/storage/bigquery) = %{version}-%{release} +Provides: golang(%{import_path}/storage/bigquery/client) = %{version}-%{release} Provides: golang(%{import_path}/storage/influxdb) = %{version}-%{release} Provides: golang(%{import_path}/storage/memory) = %{version}-%{release} Provides: golang(%{import_path}/utils) = %{version}-%{release} +Provides: golang(%{import_path}/utils/fs) = %{version}-%{release} +Provides: golang(%{import_path}/utils/fs/mockfs) = %{version}-%{release} +Provides: golang(%{import_path}/utils/procfs) = %{version}-%{release} BuildRequires: docker-io-pkg-devel BuildRequires: golang BuildRequires: golang(github.com/docker/libcontainer) @@ -157,7 +160,7 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service # devel package golang libs install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -for d in api client container deploy info healthz manager pages storage \ +for d in api client container deploy fs healthz info manager pages storage \ utils do cp -pav $d %{buildroot}/%{gopath}/src/%{import_path}/ @@ -186,24 +189,32 @@ done %dir %{gopath}/src/%{import_path}/client %dir %{gopath}/src/%{import_path}/container %dir %{gopath}/src/%{import_path}/deploy +%dir %{gopath}/src/%{import_path}/healthz +%dir %{gopath}/src/%{import_path}/fs %dir %{gopath}/src/%{import_path}/info %dir %{gopath}/src/%{import_path}/manager %dir %{gopath}/src/%{import_path}/pages %dir %{gopath}/src/%{import_path}/storage %dir %{gopath}/src/%{import_path}/utils -%dir %{gopath}/src/%{import_path}/healthz %{gopath}/src/%{import_path}/api/* %{gopath}/src/%{import_path}/client/* %{gopath}/src/%{import_path}/container/* %{gopath}/src/%{import_path}/deploy/* +%{gopath}/src/%{import_path}/healthz/* +%{gopath}/src/%{import_path}/fs/* %{gopath}/src/%{import_path}/info/* %{gopath}/src/%{import_path}/manager/* %{gopath}/src/%{import_path}/pages/* %{gopath}/src/%{import_path}/storage/* %{gopath}/src/%{import_path}/utils/* -%{gopath}/src/%{import_path}/healthz/* %changelog +* Fri Nov 14 2014 Eric Paris <eparis(a)redhat.com> - 0.6.0-0.0.git1e98602 +- update to 0.6.0 + +* Fri Nov 14 2014 Eric Paris <eparis(a)redhat.com> - 0.5.0-0.1.git8c4f650 +- include fs/*.go + * Thu Nov 13 2014 Eric Paris <eparis(a)redhat.com> - 0.5.0-0.0.git8c4f650 - update to 0.5.0

1 0

File cadvisor-89088df.tar.gz uploaded to lookaside cache by eparis
by Eric Paris 05 Dec '14

05 Dec '14

A file has been added to the lookaside cache for cadvisor: b92e4aba83bce32777763d03378e02f7 cadvisor-89088df.tar.gz

1 0

[golang-googlecode-go-crypto/el6] First package for Fedora - resolves: #1148704
by Jan Chaloupka 04 Dec '14

04 Dec '14

Summary of changes: c4eb463... First package for Fedora - resolves: #1148704 (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[golang-googlecode-go-crypto] First package for Fedora - resolves: #1148704
by Jan Chaloupka 04 Dec '14

04 Dec '14

Summary of changes: c4eb463... First package for Fedora - resolves: #1148704 (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[golang-googlecode-go-crypto/f21] First package for Fedora - resolves: #1148704
by Jan Chaloupka 04 Dec '14

04 Dec '14

Summary of changes: c4eb463... First package for Fedora - resolves: #1148704 (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[golang-googlecode-go-crypto/f20] First package for Fedora - resolves: #1148704
by Jan Chaloupka 04 Dec '14

04 Dec '14

commit c4eb4636d2da8cd5a2436ce22da6bd320ad0014e Author: Jan Chaloupka <jchaloup(a)redhat.com> Date: Thu Dec 4 15:24:45 2014 +0100 First package for Fedora - resolves: #1148704 .gitignore | 1 + golang-googlecode-go-crypto.spec | 205 ++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 207 insertions(+), 0 deletions(-) --- diff --git a/.gitignore b/.gitignore index e69de29..a74ac64 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/69e2a90ed92d03812364aeb947b7068dc42e561e.tar.gz diff --git a/golang-googlecode-go-crypto.spec b/golang-googlecode-go-crypto.spec new file mode 100644 index 0000000..3478cd3 --- /dev/null +++ b/golang-googlecode-go-crypto.spec @@ -0,0 +1,205 @@ +%global debug_package %{nil} +%global provider google +%global provider_sub code +%global provider_tld com +%global project p +%global repo crypto +%global import_path %{provider_sub}.%{provider}.%{provider_tld}/%{project}/go.%{repo} +%global rev 69e2a90ed92d03812364aeb947b7068dc42e561e +%global shortrev %(r=%{rev}; echo ${r:0:12}) + +%global x_provider golang +%global x_provider_tld org +%global x_repo crypto +%global x_import_path %{x_provider}.%{x_provider_tld}/x/%{x_repo} +%global x_name golang-%{x_provider}%{x_provider_tld}-%{repo} + +Name: golang-%{provider}%{provider_sub}-go-%{repo} +Version: 0 +Release: 0.1.hg%{shortrev}%{?dist} +Summary: Supplementary Go cryptography libraries +License: BSD +URL: https://%{import_path} +Source0: https://%{repo}.go%{provider}%{provider_sub}.%{provider_tld}/archive/%{rev}.tar.gz +%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 +BuildArch: noarch +%else +ExclusiveArch: %{ix86} x86_64 %{arm} +%endif + +%description +%{summary} + +%package devel +BuildRequires: golang >= 1.2.1-3 +Requires: golang >= 1.2.1-3 +Summary: %{summary} +Provides: golang(%{import_path}/bcrypt) = %{version}-%{release} +Provides: golang(%{import_path}/blowfish) = %{version}-%{release} +Provides: golang(%{import_path}/bn256) = %{version}-%{release} +Provides: golang(%{import_path}/cast5) = %{version}-%{release} +Provides: golang(%{import_path}/curve25519) = %{version}-%{release} +Provides: golang(%{import_path}/hkdf) = %{version}-%{release} +Provides: golang(%{import_path}/md4) = %{version}-%{release} +Provides: golang(%{import_path}/nacl/box) = %{version}-%{release} +Provides: golang(%{import_path}/nacl/secretbox) = %{version}-%{release} +Provides: golang(%{import_path}/ocsp) = %{version}-%{release} +Provides: golang(%{import_path}/openpgp) = %{version}-%{release} +Provides: golang(%{import_path}/openpgp/armor) = %{version}-%{release} +Provides: golang(%{import_path}/openpgp/clearsign) = %{version}-%{release} +Provides: golang(%{import_path}/openpgp/elgamal) = %{version}-%{release} +Provides: golang(%{import_path}/openpgp/errors) = %{version}-%{release} +Provides: golang(%{import_path}/openpgp/packet) = %{version}-%{release} +Provides: golang(%{import_path}/openpgp/s2k) = %{version}-%{release} +Provides: golang(%{import_path}/otr) = %{version}-%{release} +Provides: golang(%{import_path}/pbkdf2) = %{version}-%{release} +Provides: golang(%{import_path}/poly1305) = %{version}-%{release} +Provides: golang(%{import_path}/ripemd160) = %{version}-%{release} +Provides: golang(%{import_path}/salsa20) = %{version}-%{release} +Provides: golang(%{import_path}/salsa20/salsa) = %{version}-%{release} +Provides: golang(%{import_path}/scrypt) = %{version}-%{release} +Provides: golang(%{import_path}/sha3) = %{version}-%{release} +Provides: golang(%{import_path}/ssh) = %{version}-%{release} +Provides: golang(%{import_path}/ssh/agent) = %{version}-%{release} +Provides: golang(%{import_path}/ssh/terminal) = %{version}-%{release} +Provides: golang(%{import_path}/ssh/test) = %{version}-%{release} +Provides: golang(%{import_path}/ssh/testdata) = %{version}-%{release} +Provides: golang(%{import_path}/twofish) = %{version}-%{release} +Provides: golang(%{import_path}/xtea) = %{version}-%{release} +Provides: golang(%{import_path}/xts) = %{version}-%{release} + +%description devel +%{summary} + +This package contains library source intended for building other packages +which use the supplementary Go crypto libraries with code.google.com/p/ imports. + +%package -n %{x_name}-devel +BuildRequires: golang >= 1.2.1-3 +Requires: golang >= 1.2.1-3 +Summary: %{summary} +Provides: golang(%{x_import_path}/bcrypt) = %{version}-%{release} +Provides: golang(%{x_import_path}/blowfish) = %{version}-%{release} +Provides: golang(%{x_import_path}/bn256) = %{version}-%{release} +Provides: golang(%{x_import_path}/cast5) = %{version}-%{release} +Provides: golang(%{x_import_path}/curve25519) = %{version}-%{release} +Provides: golang(%{x_import_path}/hkdf) = %{version}-%{release} +Provides: golang(%{x_import_path}/md4) = %{version}-%{release} +Provides: golang(%{x_import_path}/nacl/box) = %{version}-%{release} +Provides: golang(%{x_import_path}/nacl/secretbox) = %{version}-%{release} +Provides: golang(%{x_import_path}/ocsp) = %{version}-%{release} +Provides: golang(%{x_import_path}/openpgp) = %{version}-%{release} +Provides: golang(%{x_import_path}/openpgp/armor) = %{version}-%{release} +Provides: golang(%{x_import_path}/openpgp/clearsign) = %{version}-%{release} +Provides: golang(%{x_import_path}/openpgp/elgamal) = %{version}-%{release} +Provides: golang(%{x_import_path}/openpgp/errors) = %{version}-%{release} +Provides: golang(%{x_import_path}/openpgp/packet) = %{version}-%{release} +Provides: golang(%{x_import_path}/openpgp/s2k) = %{version}-%{release} +Provides: golang(%{x_import_path}/otr) = %{version}-%{release} +Provides: golang(%{x_import_path}/pbkdf2) = %{version}-%{release} +Provides: golang(%{x_import_path}/poly1305) = %{version}-%{release} +Provides: golang(%{x_import_path}/ripemd160) = %{version}-%{release} +Provides: golang(%{x_import_path}/salsa20) = %{version}-%{release} +Provides: golang(%{x_import_path}/salsa20/salsa) = %{version}-%{release} +Provides: golang(%{x_import_path}/scrypt) = %{version}-%{release} +Provides: golang(%{x_import_path}/sha3) = %{version}-%{release} +Provides: golang(%{x_import_path}/ssh) = %{version}-%{release} +Provides: golang(%{x_import_path}/ssh/agent) = %{version}-%{release} +Provides: golang(%{x_import_path}/ssh/terminal) = %{version}-%{release} +Provides: golang(%{x_import_path}/ssh/test) = %{version}-%{release} +Provides: golang(%{x_import_path}/ssh/testdata) = %{version}-%{release} +Provides: golang(%{x_import_path}/twofish) = %{version}-%{release} +Provides: golang(%{x_import_path}/xtea) = %{version}-%{release} +Provides: golang(%{x_import_path}/xts) = %{version}-%{release} + + +%description -n %{x_name}-devel +%{summary} + +This package contains library source intended for building other packages +which use the supplementary Go crypto libraries with golang.org/x/ imports. + +%prep +%setup -q -n %{repo}.go-%{shortrev} + +%build + +%install +install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ +install -d -p %{buildroot}/%{gopath}/src/%{x_import_path}/ +cp -rpav xts %{buildroot}/%{gopath}/src/%{import_path}/ +cp -rpav xtea %{buildroot}/%{gopath}/src/%{import_path}/ +cp -rpav twofish %{buildroot}/%{gopath}/src/%{import_path}/ +cp -rpav ssh %{buildroot}/%{gopath}/src/%{import_path}/ +cp -rpav sha3 %{buildroot}/%{gopath}/src/%{import_path}/ +cp -rpav scrypt %{buildroot}/%{gopath}/src/%{import_path}/ +cp -rpav salsa20 %{buildroot}/%{gopath}/src/%{import_path}/ +cp -rpav ripemd160 %{buildroot}/%{gopath}/src/%{import_path}/ +cp -rpav poly1305 %{buildroot}/%{gopath}/src/%{import_path}/ +cp -rpav pbkdf2 %{buildroot}/%{gopath}/src/%{import_path}/ +cp -rpav otr %{buildroot}/%{gopath}/src/%{import_path}/ +cp -rpav openpgp %{buildroot}/%{gopath}/src/%{import_path}/ +cp -rpav ocsp %{buildroot}/%{gopath}/src/%{import_path}/ +cp -rpav nacl %{buildroot}/%{gopath}/src/%{import_path}/ +cp -rpav md4 %{buildroot}/%{gopath}/src/%{import_path}/ +cp -rpav hkdf %{buildroot}/%{gopath}/src/%{import_path}/ +cp -rpav curve25519 %{buildroot}/%{gopath}/src/%{import_path}/ +cp -rpav cast5 %{buildroot}/%{gopath}/src/%{import_path}/ +cp -rpav bn256 %{buildroot}/%{gopath}/src/%{import_path}/ +cp -rpav blowfish %{buildroot}/%{gopath}/src/%{import_path}/ +cp -rpav bcrypt %{buildroot}/%{gopath}/src/%{import_path}/ + +cp -r %{buildroot}/%{gopath}/src/%{import_path}/ %{buildroot}/%{gopath}/src/%{x_import_path}/ + +cd %{buildroot}/%{gopath}/src/%{import_path}/ +# from https://groups.google.com/forum/#!topic/golang-nuts/eD8dh3T9yyA, first post +sed -i 's/"golang\.org\/x\//"code\.google\.com\/p\/go\./g' \ + $(find . -name '*.go') + +%check +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/xts +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/xtea +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/twofish +# fails on ssh/keys_test.go:55: undefined: elliptic.P224 +#GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/ssh +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/ssh/test +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/ssh/terminal +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/ssh/agent +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/sha3 +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/scrypt +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/salsa20 +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/salsa20/salsa +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/ripemd160 +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/poly1305 +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/pbkdf2 +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/otr +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/openpgp +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/openpgp/s2k +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/openpgp/packet +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/openpgp/elgamal +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/openpgp/clearsign +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/openpgp/armor +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/ocsp +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/nacl/secretbox +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/nacl/box +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/md4 +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/hkdf +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/curve25519 +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/cast5 +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/bn256 +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/blowfish +GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/bcrypt + +%files devel +%doc LICENSE README +%{gopath}/src/%{import_path}/ + +%files -n %{x_name}-devel +%doc AUTHORS CONTRIBUTORS LICENSE PATENTS README +%{gopath}/src/%{x_import_path} + +%changelog +* Thu Dec 04 2014 jchaloup <jchaloup(a)redhat.com> - 0-0.1.hg69e2a90ed92d +- First package for Fedora + resolves: #1148704 + diff --git a/sources b/sources index e69de29..0bc61ba 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +304201b5479754434a29bcd3bfa69410 69e2a90ed92d03812364aeb947b7068dc42e561e.tar.gz

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

golang December 2014