rpms/rpm-ostree
7
0
Fork 0
Code Issues Pull Requests Releases Activity
331 Commits 13 Branches 69 Tags 11 MiB
57924cbc72
Commit Graph

294 Commits

Author SHA1 Message Date
Jonathan Lebon
1bbf6bb833 Add new libdnf build deps 2019-03-27 13:43:42 -04:00
Jonathan Lebon
97dfb21638 Release 2019.3 2019-03-27 13:04:59 -04:00
Jonathan Lebon
a118ae0cdf spec: Add bash completions to file list 
We now have bash completions! \o/
 2019-03-06 14:29:28 -05:00
Jonathan Lebon
f3884c794e Release 2019.2 2019-02-14 16:19:33 -05:00
Jonathan Lebon
2d9b7d5e90 Backport patch for local repo remote rebases 
Backport https://github.com/projectatomic/rpm-ostree/pull/1732/.
Not planning to do a Fedora respin for this, just want it to get picked
up by CAHC.
 2019-02-06 15:13:03 -05:00
Jonathan Lebon
fa4bb14da2 spec: Use --disable-dfd-over-dbus on CAHC 
Since we consume CAHC RPMs in the RHCOS dev pipeline.
 2019-02-05 14:23:03 -05:00
Fedora Release Engineering
7b6c00fbd2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild 
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
 2019-02-02 11:35:02 +00:00
Igor Gnatenko
091833c72c Remove obsolete Group tag 
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
 2019-01-28 20:24:45 +01:00
Jonathan Lebon
ae9474c945 Release 2019.1 2019-01-22 09:38:18 -05:00
Jonathan Lebon
97346cf780 Release 2018.10 2018-12-14 16:34:49 -05:00
Jonathan Lebon
634dc19315 Simplify Rust conditionals 
We can greatly simplify the Rust goop now since:

1. upstream now hard requires Rust, so there's no need to make a
   conditional for `--enable-rust`.
2. we're not rebasing rpm-ostree in f27, so we can simplify the `>= 28`
   conditionals
3. el7 is strictly backports only, so we can simplify the `0%{?rhel}`
   conditionals (though we still want to support CentOS 7)
4. the new recommended way of using Rust in el8 is to just
   `BuildRequires: rust-toolset`, so we can drop all the SCL crud.
 2018-12-04 15:29:09 -05:00
Jonathan Lebon
d8a5bf5d7a 2018.9-3: Backport patch for https://pagure.io/dusty/failed-composes/issue/956 2018-11-02 11:56:46 -04:00
Igor Gnatenko
3ce3a4b5d5 Rebuild for libsolv 0.7 
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
 2018-10-30 15:24:17 +01:00
Jonathan Lebon
fca874846e Backport patch to use systemd-0.4.0 crate 
Otherwise the `patch.crates-io` directive throws off `cargo vendor` and
`cargo build` then tries to fetch from `github.com/jlebon/rust-systemd`.
 2018-10-28 22:49:32 -04:00
Jonathan Lebon
2f9cc3806a Release 2018.9 2018-10-28 21:42:07 -04:00
Jonathan Lebon
c98d67835e spec: Add BR on toolset rust and runtime 
The `cargo` BR was already pulling in the `rust` one, though to be clear
and look closer to what the guidelines suggest, let's make that
explicit.

Also guidelines suggest we should add a BR on the `-runtime` package as
well. It includes RPM macros to help with toolset stuff (although we're
not making use of them right now).
 2018-10-15 15:07:07 -04:00
Jonathan Lebon
5d07c9f565 spec: Add indentation of conditionals 
So, this is a hack to somewhat help legibility. RPM allows leading
spaces of `%directives` but not of e.g. `BuildRequires` and
`ExclusiveArch`, so this looks a bit more awkward than it should. But
overall I think it still helps with making sense of all the nested
conditionals.
 2018-10-15 15:06:33 -04:00
Jonathan Lebon
6592dc0a63 Merge #24 Quote reference to configure macro 2018-10-12 00:14:30 +00:00
Jonathan Lebon
1f3d574d49 Add libcurl BR and upload tarball without bundled copy 
See https://github.com/projectatomic/rpm-ostree/pull/1554

(Also fix the bogus date in the `%changelog`).
 2018-09-11 10:55:09 -04:00
Jonathan Lebon
6562cb47f3 Release 2018.8 2018-09-10 17:21:09 -04:00
Colin Walters
de81c34c0f Quote reference to configure macro 
RPM expands macros in spec file comments.  Yes, it's an insane format.
It took me a while to understand why we were running `configure` twice.
 2018-08-27 12:01:18 -04:00
Colin Walters
1f289f2410 spec: Require just toolset on el>7 
This was the cause of the stray `%else\n%endif` - there's only
`BuildRequires: rust-toolset-1.26` there right now.
 2018-08-27 10:21:07 -04:00
Colin Walters
9c43f986d3 Support Rust on CentOS 7 
The pain multiplies...there's no `rust-packaging` there, and
no SRPM macros so we need a copy of the arch list.
 2018-08-20 16:07:57 -04:00
Colin Walters
5075393fb3 Add a /usr/bin/python3 BR 
Since we do use it for autofiles.  Let's use the file path
to avoid hardcoding knowledge of which package contains it.
 2018-08-14 10:05:14 -04:00
Jonathan Lebon
47d9af57c6 Merge #20 Do the SCL dance necessary to use Rust in RHEL > 7 2018-08-09 18:16:40 +00:00
Jonathan Lebon
c7aa8af948 Release 2018.7 2018-08-09 14:02:10 -04:00
Colin Walters
99142b85fc Do the SCL dance necessary to use Rust in RHEL > 7 
The `%_configure` thing was especially painful to figure out.
But anyways tested and works.

I'd like to make Rust mandatory soon, along with the general
trend of paring down our experimental/optional feature matrix.
 2018-08-09 13:59:37 -04:00
Jonathan Lebon
32bd097220 git master snapshot for RHBZ#1565647 2018-08-01 10:41:35 -04:00
Colin Walters
1196f1c2b3 https://github.com/projectatomic/rpm-ostree/pull/1461 2018-07-30 12:50:28 -04:00
Colin Walters
e255679cea https://github.com/projectatomic/rpm-ostree/pull/1469 2018-07-30 16:40:59 +00:00
Colin Walters
c92a606d60 Make build python3-only compatible for distributions that want that 2018-07-16 21:31:16 +00:00
Fedora Release Engineering
2a0fd3d7c1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild 
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
 2018-07-14 03:43:39 +00:00
Jonathan Lebon
f2b60ed353 Bump release for Rust rebuild 2018-06-29 15:37:43 -04:00
Colin Walters
a707bea879 Enable Rust 
rpm-ostree now includes some Rust code.
See https://github.com/projectatomic/rpm-ostree/pull/1377
and https://github.com/projectatomic/rpm-ostree/pull/1391
 2018-06-29 15:27:39 -04:00
Jonathan Lebon
39b44ddef2 Release 2018.6 2018-06-29 14:51:29 -04:00
Jonathan Lebon
48080d8ef7 Release 2018.5 2018-05-15 10:51:08 -04:00
Jonathan Lebon
8e5fd5e7d6 spec: use python-sphinx on RHEL/CentOS platforms 
We use this spec file to build on CentOS as well. There,
`python2-sphinx` does not exist, only `python-sphinx`. Let's accommodate
this while still respecting guidelines on Fedora.

See also:
https://github.com/CentOS/sig-atomic-buildscripts/issues/324
 2018-04-18 15:30:24 -04:00
Jonathan Lebon
24bf347350 Release 2018.4 2018-03-26 11:20:32 -04:00
Iryna Shcherbina
a2b7919bdb Update Python 2 dependency declarations to new packaging standards 2018-03-18 16:21:52 +01:00
Jonathan Lebon
5ffa5a9542 Add BR on gcc-c++ 
https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B
https://lists.fedoraproject.org/archives/list/devel-announce@lists.fedoraproject.org/thread/5TYOPW4LSPQ3RWP34VIS25MQE4EVJOGF/
 2018-03-07 14:14:25 +00:00
Dusty Mabe
2acd02cd70
backport treating FUSE as netfs for s390x 2018-03-01 17:10:32 -05:00
Dusty Mabe
62c6ccb47b
fix date in changelog 
sorry, the warning messages about invalid dates bother me
 2018-03-01 16:46:11 -05:00
Jonathan Lebon
d146cef5e4 Release 2018.3 2018-02-18 21:46:42 +00:00
Jonathan Lebon
28c16f3b69 spec: Bump ostree BR to v2018.2 
We use the new checkout filtering features from it.
 2018-02-16 21:32:37 +00:00
Jonathan Lebon
580f4db85f Drop all patches and fix bogus dates 2018-02-16 21:13:37 +00:00
Jonathan Lebon
70a8898860 Release 2018.2 2018-02-16 21:04:01 +00:00
Fedora Release Engineering
ca07ae18bf - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild 
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
 2018-02-09 13:18:29 +00:00
Dusty Mabe
866d7e07f7
Revert the ostree:// formatting in the output. 
See https://github.com/projectatomic/rpm-ostree/pull/1136#issuecomment-358122137

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
 2018-01-19 21:26:37 -05:00
Jonathan Lebon
bf924bb6f5 spec: add rpm-ostreed.conf file entry 
Just remembered this had to go in as well with the upstream work. Sure
enough, rdgo is currently failing on this. Let's get it chugging along
again!
 2018-01-16 21:45:43 +00:00
Jonathan Lebon
502d70123f spec: bump ostree requirement to 2017.15 
We make use of the new `ostree_break_hardlink` API. Otherwise, no build
requirements on v2018.1 itself.
 2018-01-15 20:44:54 +00:00
Colin Walters
14902173d2 Release 2018.1 2018-01-15 14:56:57 -05:00
Jonathan Lebon
0e3b7e4ada 2017.11-1: New upstream release 2017-12-04 22:21:21 +00:00
Colin Walters
b1f1a8a384 Backport patch for NFS issues 2017-11-22 11:43:17 -05:00
Jonathan Lebon
774cabbaaa 2017.10-2: Backport fix for --repo handling 
https://github.com/projectatomic/rpm-ostree/pull/1101
 2017-11-14 14:53:48 +00:00
Colin Walters
a43cbae1de New upstream release 2017-11-02 17:51:59 -04:00
Jonathan Lebon
b6f475dcdd spec: add explicit requires for -libs subpackage 
RPMDiff was complaining about this:

```
Subpackage rpm-ostree on x86_64 consumes library
librpmostree-1.so.1()(64bit) from subpackage rpm-ostree-libs but does
not have explicit package version requirement.
Please add Requires: rpm-ostree-libs = %{version}-%{release} to
rpm-ostree in the specfile to avoid the need to test interoperability
between the various combinations of old and new subpackages.
```

Since we don't use any symbol versioning in rpm-ostree, this seems like
a fair point. In practice, the matching -libs package should be
available at the same time when composing/installing, though this
protects us from manual `rpm` invocations as well.
 2017-09-26 14:29:18 +00:00
Jonathan Lebon
4bd8b46192 2017.9-1: new upstream version 
Also bump requirement on libostree for multiple things, including
`OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_IDENTICAL`.
 2017-09-25 17:23:01 +00:00
Jonathan Lebon
77767f7d82 2017.8-2: patch to allow metadata_expire=0 2017-08-21 17:17:12 -04:00
Jonathan Lebon
d52199e26b 2017.8-1: new upstream version 2017-08-18 09:28:19 -04:00
Igor Gnatenko
42de731f48 Rebuilt for RPM soname bump 
Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
 2017-08-10 22:13:07 +02:00
Igor Gnatenko
b5be235d24 Rebuilt for RPM soname bump 
Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
 2017-08-10 20:32:36 +02:00
Fedora Release Engineering
e8070f1e2a - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 07:47:42 +00:00
Fedora Release Engineering
7de4378899 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 13:16:23 +00:00
Jonathan Lebon
0cf999b064 2017.7-3: rename libs pkg to rpm-ostree-libs 
Tweak new pkg name to rpm-ostree-libs to be more consistent with the
main package name and ostree's ostree-libs.
 2017-07-21 09:17:27 -07:00
Colin Walters
821808ecc7 Enable introspection, rename shared lib to librpmostree 
Due to an oversight, we were not actually building with introspection. Fix that.
And while we are here, split out a shared library package, so that e.g.
containers can do `from gi.repository import RpmOstree` without dragging in the
systemd service, etc.
 2017-07-21 08:54:20 -07:00
Jonathan Lebon
bef41dbf6e 2017.7-1 -- new upstream version 2017-07-10 14:22:02 -07:00
Colin Walters
9e1337e6ef Update to git snapshot to help debug compose failure 2017-06-24 10:38:52 -04:00
Colin Walters
577c976ea1 upstream: Include introspection XML 
https://github.com/projectatomic/rpm-ostree/pull/841#pullrequestreview-45986613
 2017-06-23 09:43:51 -04:00
Colin Walters
0b6fada9e0 Add polkit to files 2017-06-20 10:40:05 -04:00
Colin Walters
47ec5ea0f5 BR polkit for git master change 2017-06-20 10:34:00 -04:00
Jonathan Lebon
210621118c spec: actually bump the release tag 
And go make a cup of tea.
 2017-05-31 10:47:13 -04:00
Jonathan Lebon
db3835a322 2017.6-3 -- don't auto-provide libdnf SO 
We don't want RPM's auto-provide to think we're providing libdnf for the
whole world. It's only for us; we're greedy like that.

Resolves: RHBZ#1457089
 2017-05-31 10:42:31 -04:00
Jonathan Lebon
4625b7b93c fix changelog date entry to appease rpm 2017-05-26 17:30:24 -04:00
Jonathan Lebon
af96c46965 2017.6-2 -- bump libostree dep 
This isn't a new API function so the default rpm detection doesn't work.
But we do need a new ostree for
https://github.com/ostreedev/ostree/pull/804.
 2017-05-26 17:27:56 -04:00
Jonathan Lebon
9bf56853a5 2017.6-1 -- new upstream version 2017-05-26 16:56:08 -04:00
Jonathan Lebon
96b8d0ff68 2017.5-2: bump libostree dep & rebuild in override 2017-04-28 11:18:29 -04:00
Jonathan Lebon
c43bf439b0 2017.5-1 -- new upstream version 2017-04-28 10:30:43 -04:00
Jonathan Lebon
f30773dcfb 2017.4-2 -- backport patch for unprivileged status 2017-04-14 18:09:09 -04:00
Jonathan Lebon
27df6f91b6 2017.4-1 -- new upstream version 2017-04-13 14:03:33 -04:00
Colin Walters
794d0df4b7 Backport patch to add API devices for running on CentOS 7 
https://github.com/projectatomic/rpm-ostree/issues/727
 2017-04-11 14:03:51 -04:00
Colin Walters
9a03814662 Add patch to fix f26 altfiles 2017-03-16 17:29:40 -04:00
Colin Walters
7930a14957 Backport patch for running in koji 2017-03-10 12:56:54 -05:00
Colin Walters
abbdd0da43 Backport patch for running in koji 2017-03-10 12:41:51 -05:00
Colin Walters
793e3450e3 Backport patch for running in koji 2017-03-10 11:55:51 -05:00
Colin Walters
5b1c3c0442 Update package description 2017-03-07 08:57:49 -05:00
Colin Walters
86cf9571ff spec: Drop libgsystem BR, bump ostree 2017-03-07 08:53:22 -05:00
Colin Walters
f9a2173a0a New upstream version 
Fixes: CVE-2017-2623
  Resolves: #1422157
 2017-03-06 14:20:16 -05:00
Colin Walters
244f693247 Add patch to bump requires for ostree 2017-03-02 20:16:47 -05:00
Colin Walters
1cbe5cdaa6 Add requires on ostree 2017-02-27 12:09:25 -05:00
Colin Walters
3e26efafd3 spec: Require ostree too 2017-02-27 12:06:10 -05:00
Colin Walters
70988d6d32 Add patch for gperf 3.1 compatibility 
Resolves: #1424268
 2017-02-18 09:00:47 -05:00
Colin Walters
6b7575a219 New upstream version 2017-02-14 21:58:18 -05:00
Fedora Release Engineering
e3bff4254f - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 11:50:48 +00:00
Colin Walters
f4d2fc43cd Back out netns usage for now for https://pagure.io/releng/issue/6602 2017-01-27 03:10:11 -05:00
Colin Walters
d0f658d726 Update sources for previous commit 2017-01-22 14:35:29 -05:00
Colin Walters
6e419a1ea5 New upstream version 2017-01-22 14:33:14 -05:00
Colin Walters
f934bc16e6 New upstream version 2016-12-12 13:19:30 -05:00
Colin Walters
846be19124 Backport patch to fix install-langs 2016-11-26 14:23:12 -05:00
Colin Walters
fb290ee442 New upstream version 2016-11-15 14:40:16 -05:00
Colin Walters
5c4fd3e1d5 New upstream version 2016-10-24 09:39:57 -04:00
Colin Walters
7081d79d1a New upstream version 2016-10-07 17:04:26 -04:00
Colin Walters
ffb56a4be4 New upstream version 2016-09-08 20:42:46 -04:00
Colin Walters
c6114b0b46 New upstream version 2016-09-07 21:50:56 -04:00
Colin Walters
81aa294d9d New upstream version 2016-09-07 21:29:58 -04:00
Colin Walters
3700dde71b Add requires on fuse 2016-09-01 06:45:52 -04:00
Colin Walters
beaf676778 Backport patch for running inside mock 2016-08-31 16:51:59 -04:00
Colin Walters
59fe1d1510 Backport patch for running inside mock 2016-08-31 16:48:33 -04:00
Colin Walters
84fb4af096 Backport patch to fix mutate-os-release 2016-08-17 17:00:46 -04:00
Colin Walters
23e04eeab9 New upstream version 2016-08-13 10:54:13 -04:00
Colin Walters
9b9e97398b Backport patches from master to fix non-containerized composes 2016-08-12 20:06:23 -04:00
Colin Walters
b5ef2f19b8 New upstream version 2016-08-11 16:36:14 -04:00
Colin Walters
a56f6d9307 New upstream version 2016-07-25 14:28:31 -04:00
Colin Walters
402f823d30 Require bubblewrap 2016-07-11 16:19:23 -04:00
Colin Walters
5895086fe5 Require bubblewrap 2016-07-11 16:18:36 -04:00
Colin Walters
a644eb10cc New upstream version 2016-07-08 16:27:13 -04:00
Colin Walters
4d375aa51e Backport fixes from https://github.com/projectatomic/rpm-ostree/commits/2016.3-fixes 2016-07-07 21:01:20 +00:00
Colin Walters
3959c0616e Rework to use libhif as git submodule 
https://github.com/projectatomic/rpm-ostree/pull/357
 2016-06-30 11:32:40 -04:00
Colin Walters
d452ad1837 Add gperf BR for upstream changes 2016-06-24 13:22:13 -04:00
Colin Walters
893f6e4740 BR libsystemd for future upstream changes 2016-06-23 10:28:39 -04:00
Colin Walters
f4a6dc640f Backport fixes from https://github.com/projectatomic/rpm-ostree/commits/2016.3-fixes 2016-06-15 15:52:25 -04:00
Colin Walters
4fdad76c5b Two fixes for non-bundled build 
In the non-bundled case:

 - Don't exclude requires on libhif
 - Don't inject an RPATH
 2016-05-27 11:59:11 -04:00
Colin Walters
2f39d383bb Clean up BRs 
The libhif BRs should only be pulled in if building with bundled
libhif.
 2016-05-26 14:40:38 -04:00
Colin Walters
8a57b061b9 build: Make libhif bundling an option 
For rpmdistro-gitoverlay, it's more convenient to just do libhif as a
system wide thing.
 2016-05-24 17:13:00 -04:00
Colin Walters
5738f10432 New upstream version 2016-05-20 09:13:01 -04:00
Colin Walters
4e9da1c5e2 Provides: rpm-ostree-client for CentOS7/RHEL 
This way `cockpit` can work if we only have `rpm-ostree` in the
root.
 2016-05-07 14:37:41 -04:00
Colin Walters
bf6a6ce7d3 BR cmake 2016-04-19 10:54:36 -04:00
Colin Walters
8240cf91ac Backport patch to fix Fedora composes writing data into source file:/// URIs 2016-03-31 14:02:18 -04:00
Colin Walters
ee00821e45 New upstream version 2016-03-28 12:10:24 -04:00
Colin Walters
6d29112807 build: Fix installation 
I'd only been testing builds, but we really should have been testing
the runtime too.
 2016-02-29 16:51:51 -05:00
Colin Walters
4cc19b0c9a New git snapshot, just getting some new code out there 
- We are now bundling a copy of libhif, as otherwise coordinated releases with
  PackageKit/dnf would be required, and we are not ready for that yet.
 2016-02-23 21:11:59 -05:00
Colin Walters
ca071a8191 Add a provides for the libhif bundling 
Reported-by: Adam Williamson
 2016-02-23 20:52:24 -05:00
Colin Walters
b3c7300a93 build: Fix LD_LIBRARY_PATH 2016-02-23 10:30:15 -05:00
Colin Walters
1aa245a23c New git snapshot, just getting some new code out there 
- We are now bundling a copy of libhif, as otherwise coordinated releases with
  PackageKit/dnf would be required, and we are not ready for that yet.
 2016-02-23 08:58:03 -05:00
Colin Walters
254e983c23 Bundle libhif 
There's major work going on in the "libhif" project to merge a lot of
functionality.  Things are going to be unstable for a while, and it's
not realistic to tie the release cycles of the consumers (rpm-ostree,
dnf, PackageKit) all together at once.

We'll iterate and break API for a while, then try to stabilize later.
 2016-02-18 21:20:58 -05:00
Matthew Barnes
efb0717443 Fix URL 2016-02-10 14:03:46 -05:00
Fedora Release Engineering
bd42142286 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-04 22:18:13 +00:00
Colin Walters
6a0e57ac84 BR libarchive for future upstream work 2016-01-12 10:56:24 -05:00
Colin Walters
5ab8b00d3a New upstream version 2015-12-15 10:05:25 -05:00
Colin Walters
4647135f71 New upstream version 2015-11-21 10:11:47 -05:00
Colin Walters
b5323ff85f Fix files list for -devel, which should in turn fix Anaconda 
builds which pull in rpm-ostree, but should not have devel bits.
 2015-11-09 13:09:14 -05:00
Colin Walters
dfe6d9e4b5 Add patch that should fix bodhis use of --workdir-tmpfs 2015-10-30 21:50:34 -04:00
Colin Walters
145a0580a3 Prototype out "autofiles" 
The daemon branch landing upstream meant the %files section broke.
Let's switch to something more relaxed.
 2015-09-15 15:17:34 -04:00
Kalev Lember
8c4db2a2c0 Rebuilt for librpm soname bump 2015-09-05 14:11:30 +02:00
Colin Walters
16206e44d5 New upstream version 2015-08-26 12:26:09 -04:00
Colin Walters
ad2f2f10d9 New upstream version 2015-08-04 10:44:18 -04:00
Colin Walters
4d1f0f898d rebuilt 2015-07-27 10:12:22 -04:00
Colin Walters
c4d3bd8a57 Rebuild for CentOS update to libhif 2015-07-20 15:13:32 -04:00
Colin Walters
13d86cba95 Rebuild to pick up hif_source_set_required() 2015-06-15 22:21:38 -04:00
Colin Walters
6230ef98af New upstream version 2015-06-15 14:18:53 -04:00
Colin Walters
7d53a829df New upstream version 2015-06-09 10:17:32 -04:00