Commit Graph

42 Commits

Author SHA1 Message Date
piegames
68927918d0 treewide: Fix indentation in strings
The indentation stripping semantics of strings are fairly bad and have a
few gotchas where the resulting string has not the intended indentation.
This commit fixes most if not all such instances in Nixpkgs.

I tried to strive a balance between keeping the diff small and
reformatting/refactoring the code to look better. In general,
reformatting should be left to Nixfmt.

Note that this causes a lot of rebuilds by design. All changes need to
be thoroughly vetted and reviewed for correctness. There is no automatic
way to prove correctness.

List of files to fix generated by running
https://gerrit.lix.systems/c/lix/+/2092 on Nixpkgs and looking at the
warnings.
2024-10-22 21:36:42 +02:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Philip Taron
ae92f312bf
treewide: use a consistent meta.priority default 2024-08-29 09:04:57 -07:00
github-actions[bot]
568f381221
Merge master into staging-next 2024-01-23 12:01:17 +00:00
Bryan Lai
0ccfce7867 inetutils: set priority lower than util-linux
The `logger` binary from `util-linux` should be the priority. This has
been the default for many linux distributions. To instead prioritize
this package, set a _lower_ `meta.priority`, or use e.g.

  lib.setPrio 5 inetutils
2024-01-19 14:53:39 +08:00
Thomas Gerbet
bfb2d0dfae inetutils: 2.4 -> 2.5
Changes:
```
* Noteworthy changes in release 2.4 (2022-10-25) [stable]

** ifconfig

*** Support specifying prefix netmask lengths in -A.
Patch by Samuel Thibault <samuel.thibault@gnu.org>.

** Hurd: tell pfinet translator interfaces to configure
Patch by Samuel Thibault <samuel.thibault@gnu.org>.

** ftp

*** Avoid crash caused by signed integer overflow resulting in
out-of-bounds buffer access.  Reported by AiDai in
<https://lists.gnu.org/archive/html/bug-inetutils/2021-12/msg00003.html>.

*** Avoid crash caused by heap buffer overflow.  Reported by ZFeiXQ in
<https://lists.gnu.org/archive/html/bug-inetutils/2021-12/msg00016.html>.

*** Avoid crash caused by NULL pointer dereference.  Reported by AiDai in
<https://lists.gnu.org/archive/html/bug-inetutils/2021-12/msg00004.html>.

*** Avoid crash caused by infinite macro recursion.  Reported by AiDai in
<https://lists.gnu.org/archive/html/bug-inetutils/2021-12/msg00005.html>.

** telnetd

*** Avoid crash on 0xff 0xf7 (IAC EC) or 0xff 0xf8 (IAC EL).  CVE-2022-39028
https://pierrekim.github.io/blog/2022-08-24-2-byte-dos-freebsd-netbsd-telnetd-netkit-telnetd-inetutils-telnetd-kerberos-telnetd.html

** telnet

*** Fix a buffer overflow problem.  CVE-2019-0053
https://cgit.freebsd.org/src/commit/?id=14aab889f4e50072a6b914eb95ebbfa939539dad

** tftp

*** Avoid crashing when given unexpected or invalid commands from tty.
Reported by AiDai in
<https://lists.gnu.org/archive/html/bug-inetutils/2021-12/msg00018.html>.

** Various bugs fixes, internal improvements and clean ups.
Update of gnulib and build fixes for C23.

```
2024-01-07 18:51:31 +01:00
Randy Eckenrode
2feff8a9bf
inetutils: fix build on x86_64-darwin
This is a workaround to avoid mass rebuilds in staging-next. The problem
is the 10.12 source-based SDK does not include `utmp.h`, but it should.
Another PR will fix that for the next staging cycle and revert this commit.
2023-11-07 09:20:08 -05:00
Robert Scott
cc841fa430 inetutils: enable tests 2023-09-25 07:18:15 +02:00
Robert Scott
aa54e0d65d inetutils: add patch for CVE-2023-40303 2023-09-25 07:18:15 +02:00
Rick van Schijndel
ec106b98dd inetutils: fix cross
I guess with #181764 this might've broken for cross.
Perl propagates libxcrypt, but is only listed in nativeBuildInputs.
List libxcrypt in buildInputs to ensure it's picked up properly.
2022-11-14 18:19:56 +01:00
Thomas Gerbet
ab3e70ae07 inetutils: 2.3 -> 2.4
```
GNU inetutils NEWS -- history of user-visible changes.

* Noteworthy changes in release 2.4 (2022-10-25) [stable]

** ifconfig

*** Support specifying prefix netmask lengths in -A.
Patch by Samuel Thibault <samuel.thibault@gnu.org>.

** Hurd: tell pfinet translator interfaces to configure
Patch by Samuel Thibault <samuel.thibault@gnu.org>.

** ftp

*** Avoid crash caused by signed integer overflow resulting in
out-of-bounds buffer access.  Reported by AiDai in
<https://lists.gnu.org/archive/html/bug-inetutils/2021-12/msg00003.html>.

*** Avoid crash caused by heap buffer overflow.  Reported by ZFeiXQ in
<https://lists.gnu.org/archive/html/bug-inetutils/2021-12/msg00016.html>.

*** Avoid crash caused by NULL pointer dereference.  Reported by AiDai in
<https://lists.gnu.org/archive/html/bug-inetutils/2021-12/msg00004.html>.

*** Avoid crash caused by infinite macro recursion.  Reported by AiDai in
<https://lists.gnu.org/archive/html/bug-inetutils/2021-12/msg00005.html>.

** telnetd

*** Avoid crash on 0xff 0xf7 (IAC EC) or 0xff 0xf8 (IAC EL).  CVE-2022-39028
https://pierrekim.github.io/blog/2022-08-24-2-byte-dos-freebsd-netbsd-telnetd-netkit-telnetd-inetutils-telnetd-kerberos-telnetd.html

** telnet

*** Fix a buffer overflow problem.  CVE-2019-0053
https://cgit.freebsd.org/src/commit/?id=14aab889f4e50072a6b914eb95ebbfa939539dad

** tftp

*** Avoid crashing when given unexpected or invalid commands from tty.
Reported by AiDai in
<https://lists.gnu.org/archive/html/bug-inetutils/2021-12/msg00018.html>.

** Various bugs fixes, internal improvements and clean ups.
Update of gnulib and build fixes for C23.
```
2022-10-31 08:42:06 -05:00
Robert Scott
72d2cd3208 inetutils: add patch for CVE-2022-39028 2022-09-04 18:33:14 +01:00
R. Ryantm
e6927bd855 inetutils: 2.2 -> 2.3 2022-07-31 14:22:19 +00:00
Ashish SHUKLA
8cbcf42add inetutils: 2.0 -> 2.2
- Remove already upstream-ed patches
2021-09-03 10:33:46 +09:00
davidak
8c8cf04de2
Merge pull request #120576 from wahjava/update-inetutils
inetutils: 1.9.4 -> 2.0
2021-08-26 05:25:56 +02:00
Julien Moutinho
8184d8b0f2 apparmor: fix profile building on darwin 2021-05-14 17:37:33 +02:00
Ashish SHUKLA
2a51117bdd
inetutils: 1.9.4 -> 2.0
- Remove the already upstream-ed (or not applicable anymore) patches
- Add patches to update .ORG, and .IN WHOIS servers (submitted upstream)
- Split name into pname, and version
- Switch to .xz distfile (smaller)
2021-04-25 15:48:59 +05:30
Julien Moutinho
05d334cfe2 Revert "Revert "apparmor: fix and improve the service""
This reverts commit 420f89ceb2.
2021-04-23 07:17:55 +02:00
Vladimír Čunát
420f89ceb2
Revert "apparmor: fix and improve the service"
This reverts commit fb6d63f3fd.

I really hope this finally fixes #99236: evaluation on Hydra.
This time I really did check basically the same commit on Hydra:
https://hydra.nixos.org/eval/1618011

Right now I don't have energy to find what exactly is wrong in the
commit, and it doesn't seem important in comparison to nixos-unstable
channel being stuck on a commit over one week old.
2020-10-07 12:22:18 +02:00
Julien Moutinho
fb6d63f3fd apparmor: fix and improve the service 2020-09-06 07:43:03 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Michael Eden
19094e72bf inetutils: cross compile 2019-04-16 19:04:40 +02:00
c0bw3b
0498ccd076 Treewide: use HTTPS on GNU domains
HTTP -> HTTPS for :
- http://gnu.org/
- http://www.gnu.org/
- http://elpa.gnu.org/
- http://lists.gnu.org/
- http://gcc.gnu.org/
- http://ftp.gnu.org/ (except in fetchurl mirrors)
- http://bugs.gnu.org/
2018-12-02 15:51:59 +01:00
Matthew Bauer
85e1f22b98 inetutils: cleanup
- supports darwin (only when servers are disabled)
- pass SUIDMODE= to avoid setuid
- add myself as maintainer
2018-04-30 22:30:37 -05:00
Will Dietz
4b7b083bcb treewide: stdenv.lib.platforms.gnu -> ... gnu ++ linux
Include all linux platforms.
2018-04-30 18:12:10 -05:00
Will Dietz
b47f502d64 inetutils: fix build w/musl 2018-02-13 09:44:43 -06:00
Jörg Thalheim
67adf69a16
inetutils: fix service name 2017-04-20 10:33:42 +02:00
Neil Mayhew
ba8b6b4a7a
inetutils: Add patch for Canadian TLD server
Cherry-picked from upstream (inetutils-1_9_4-31-g73e2811).

Could be a long time before a new inetutils release is made.
vcunat amended the patch to apply.
2017-03-07 21:30:03 +01:00
Neil Mayhew
c78251f17c inetutils: Add perl to buildInputs
`whois' uses perl for various things during its build. Without it,
whois fails to build .
2017-03-06 21:05:42 -07:00
Vladimír Čunát
91407a8bdf ncurses: split into multiple outputs
Some programs (e.g. tput) might better be moved somewhere else than
$dev/bin, but that can be improved later if need be.
2015-10-13 20:18:44 +02:00
William A. Kennington III
bc4e1f3c1a inetutils: 1.9.3 -> 1.9.4 2015-06-16 15:20:28 -07:00
William A. Kennington III
da719f19a6 inetutils: 1.9.2 -> 1.9.3 2015-05-15 18:38:13 -07:00
Ludovic Courtès
41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Bjørn Forsman
c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Evgeny Egorochkin
031a44a817 inetutils: update from 1.9.1 to 1.9.2 2014-03-01 05:29:14 +02:00
Eelco Dolstra
4952fa98ee inetutils: Update to 1.9.1 and fix compilation
http://hydra.nixos.org/build/3052788
2012-09-21 13:39:20 -04:00
Ludovic Courtès
38c35ba49b GNU Inetutils 1.8.
svn path=/nixpkgs/trunk/; revision=21814
2010-05-17 09:31:43 +00:00
Eelco Dolstra
56babc131d * inetutils: traceroute also needs a chmod +x.
svn path=/nixpkgs/trunk/; revision=19393
2010-01-13 13:46:22 +00:00
Ludovic Courtès
9ba4676ae1 GNU Inetutils 1.7.
svn path=/nixpkgs/trunk/; revision=19005
2009-12-16 22:56:44 +00:00
Ludovic Courtès
6646f2e8e1 GNU Inetutils 1.6.
svn path=/nixpkgs/trunk/; revision=13920
2009-01-30 23:38:02 +00:00
Ludovic Courtès
a21609b1ab Add GNU Inetutils.
svn path=/nixpkgs/trunk/; revision=10817
2008-02-21 18:58:11 +00:00