Fix tr hack to not leak (!2) · Merge requests · pkg / rust-coreutils

Closed Sjoerd Simons requested to merge wip/sjoerd/dont-leak-boxes into wip/aferraris/default-coreutils 3 years ago

Jun 14, 2021

Sjoerd Simons authored 3 years ago


Rather then leaking a boxed value to keep the upstream code working wrap
the unescape string into a cow. This causes a bunch of allocations
to happen if the upper/lower character classes are used but at least
there are no allocations leaked.

Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>

28eaa0e4

Jun 11, 2021

Release rust-coreutils version 0.0.6-1~exp1+apertis1 · 838c3a59
Apertis package maintainers authored 3 years ago

838c3a59

d/patches: add fixes for Apertis · d1ec9ee3

Apertis package maintainers authored 3 years ago


The current implementation of `rust-coreutils` isn't complete yet, and
some of the executables need improvements in order to be able to build a
base Apertis system.

This commit adds the necessary patches to ensure we can use to package
to build Apertis images.

Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>

d1ec9ee3

d/patches: remove empty and/or outdated patches · af641515

Apertis package maintainers authored 3 years ago


The `revert-twox-hash.dif` patch is no longer needed as a similar change
was merged upstream, which is included in this package as part of the
`sort` backport.

`bump-thread-local` is an empty file causing issues when using `gbp pq`,
and can be safely removed.

Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>

af641515

d/control: add missing dependency for `sort` · eec69abe

Apertis package maintainers authored 3 years ago


The new implementation of `sort` backported from upstream adds a
dependency on the `rayon` crate. This commit adds the corresponding
Debian package as a build-dependency.

Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>

eec69abe

d/patches: backport improvements to the `sort` command · 9f915459

Apertis package maintainers authored 3 years ago


The post-installation script of at least one packages makes use of the
`-k` option for `sort`, which isn't implemented in release 0.0.6 of
`rust-coreutils`.

As this has since been implemented upstream, this commit picks the
corresponding patches so we can benefit of those improvements.

Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>

9f915459

debian: create missing symlinks · d1f3a55d

Apertis package maintainers authored 3 years ago


`rust-coreutils` provides `hashsum` as an implementation for all `*sum`
executables (md5sum, sha1sum...). As most software expect individual
binaries for each of those, this commit adds symlinks pointing to
`hashsum` for all supported algorithms.

Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>

d1f3a55d

d/rules: remove conflicting binaries · 4097bd35

Apertis package maintainers authored 3 years ago


Some of the executables installed by `rust-coreutils` are already
provided by other packages:
- `more` is provided by `util-linux`
- `hostname` is provided by `hostname`
- `kill` and `uptime` are provided by `procps`

Removing those executables from this package solves conflicts.

Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>

4097bd35

d/control: allow this package to fully replace `coreutils` · d99228f9

Apertis package maintainers authored 3 years ago


As we want `rust-coreutils` to be a replacement to `coreutils-gplv2`, we
need to ensure this package gets picked up when boostrapping the system,
and that `coreutils-gplv2` won't be installed at the same time.

This is achieved by:
- adding Conflicts/Breaks/Replaces/Provides relationships identical to
  those of `coreutils-gplv2`
- adding another Conflicts relationship with `coreutils-gplv2`
- make the package priority `required` so it can be pulled by
  `debootstrap`

Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>

d99228f9

Fix tr hack to not leak

Merge request reports

Activity