Commit Graph

226 Commits

Author SHA1 Message Date
Sergei Trofimovich
97ad266c07 samba: 4.20.1 -> 4.20.4
Changes:
- https://www.samba.org/samba/history/samba-4.20.2.html
- https://www.samba.org/samba/history/samba-4.20.3.html
- https://www.samba.org/samba/history/samba-4.20.4.html
2024-08-14 09:15:16 +01:00
Peder Bergebakken Sundt
d4b7361c84
Merge pull request #311458 from TomaSajt/servers-toplevel-with
Remove usage of top-level `with lib;` from `pkgs/servers`
2024-08-08 22:50:56 +02:00
adisbladis
e0816431a2 treewide: Pass self when overriding Python
Otherwise references to the Python interpreter inside the set are wrong, as demonstrated by:
``` nix
with import <nixpkgs> { };
let
  python' = python3.override {
    packageOverrides = final: prev: { requests = prev.requests.overridePythonAttrs(old: { version = "1337";  }); };
  };
in python'.pkgs.python.pkgs.requests
```
which returns the _non_ overriden requests.

And the same with `self`:
```
with import <nixpkgs> { };
let
  python' = python3.override {
    self = python';
    packageOverrides = final: prev: { requests = prev.requests.overridePythonAttrs(old: { version = "1337";  }); };
  };
in python'.pkgs.python.pkgs.requests
```
which returns the overriden requests.

This can manifest itself as file collisions when constructing environments or as subtly incorrect dependency graphs.
2024-08-03 12:18:56 +12:00
éclairevoyant
0926bdbf98
treewide: fix uses of finalAttrs.pname in source urls 2024-07-12 20:23:39 -04:00
TomaSajt
afb6c6e279
samba: remove top-level with lib; 2024-06-30 12:52:20 +02:00
Alyssa Ross
3df6bb2c85
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/applications/blockchains/polkadot/default.nix
2024-06-09 22:47:12 +01:00
Alexis Hildebrandt
f8c4a98e8e treewide: Remove the definite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"([Tt]he)? ' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Tt]he (.)/\1\U\2/'
2024-06-09 23:08:46 +02:00
Alyssa Ross
67641d0589 wafHook: don't add cross compilation flags
These flags are not part of waf, they're custom flags that are not
widely implemented.  More packages are broken because of these flags
being added than actually recognise them.

Of the packages in Nixpkgs that directly depend on wafHook that we can
attempt to cross compile (i.e. all their dependencies cross compile),
5 already successfully cross compile and recognise these flags, 2
already successfully cross compile because they have been opted out of
these flags, 3 don't cross compile successfully for reasons unrelated
to these flags, and for the remaining 7, the only thing stopping them
cross compiling successfully is that they are being passed these flags
that they don't recognise.

All of the five successfully cross-compiling packages that do
recognise these flags are samba projects: ldb, talloc, tdb, tevent,
and samba4.  So this isn't a general waf convention, just a samba one.
It therefore doesn't make sense to set these flags by default.  They
should just be included in the expressions for each samba project,
like all the other quirks common to samba build systems.

This change fixes cross compilation of the following packages:

  blockhash ganv ndn-cxx mda_lv2 pflask raul saldl
2024-05-15 16:47:16 +02:00
Sergei Trofimovich
7a6de57fbf samba: 4.20.0 -> 4.20.1
Changes: https://www.samba.org/samba/history/samba-4.20.1.html
2024-05-08 22:19:29 +01:00
Mario Rodas
d1b9eb7e07
Merge pull request #302070 from anthonyroussel/samba-add-pkg-config-testers
samba,ldb: add meta.pkgConfigModules, passthru.tests.{pkg-config,version}
2024-04-19 19:48:14 -05:00
Arnout Engelen
c531d97bf8 samba: work around reproducible-builds issue
Upstream issue https://bugzilla.samba.org/show_bug.cgi?id=15632

Fixes #303436
2024-04-13 13:22:34 +02:00
Anthony Roussel
e3466f56e1
samba: add meta.pkgConfigModules, passthru.tests.{pkg-config,version} 2024-04-06 13:25:56 +02:00
qubitnano
697246c92c samba: 4.19.5 -> 4.20.0 2024-03-29 22:05:17 -04:00
R. Ryantm
7dec18dad1 samba: 4.19.4 -> 4.19.5 2024-02-19 20:25:18 +00:00
Sergei Trofimovich
9e38b7b0fb pkgsi686Linux.samba: don't configure waf in parallel on 32-bit systems
Without the change `waf configure` hung on `i686Linux.samba` on systems
with large amount of host CPUs (for me it's 16).

This happens because one of the worker processes gets `-ENOMEM` and does
not recover from it:

    2084476 mmap2(NULL, 8392704, PROT_NONE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_STACK, -1, 0) = -1 ENOMEM (Cannot allocate memory)
    2084476 munmap(0xf2b5c000, 16384)       = 0
    2084476 rt_sigprocmask(SIG_BLOCK, ~[RT_1], NULL, 8) = 0
    2084476 madvise(0x1ff000, 8372224, MADV_DONTNEED) = 0
    2084476 exit(0)                         = ?
    2084476 +++ exited with 0 +++

THe change extends 32-bit arm workaround to limit to one thread to all
32-bit systems.
2024-02-16 23:14:39 +00:00
R. Ryantm
7198aced6e samba: 4.19.3 -> 4.19.4 2024-01-09 11:53:46 +00:00
Linus Heckemann
d384270823
Merge pull request #270419 from Myaats/update-samba
samba: 4.19.2 -> 4.19.3
2023-12-15 14:00:31 +01:00
Mats
aa3928fad4 samba: fix cross compilation 2023-11-28 10:09:42 +01:00
Mats
09470cf630 samba: 4.19.2 -> 4.19.3 2023-11-28 09:37:32 +01:00
Mats
9b5cfd41d8 samba: fix samba-tool
This commit addresses the following issues:
- samba-tool requiring python built with libxcrypt-legacy
- adding the missing markdown python package
- fixing the shebang patching so disallowedReferences passes
2023-11-24 14:31:19 +01:00
Sergei Trofimovich
c2910afd5d samba: 4.19.1 -> 4.19.2
Changes: https://www.samba.org/samba/history/samba-4.19.2.html
2023-11-06 08:13:19 +00:00
Yaya
3b9c240c73 samba: 4.18.6 -> 4.19.1
https://lists.samba.org/archive/samba-announce/2023/000651.html

Fixes CVE-2023-3961
Fixes CVE-2023-4091
Fixes CVE-2023-4154
Fixes CVE-2023-42669
Fixes CVE-2023-42670
2023-10-21 18:54:51 +02:00
Anderson Torres
e24107b347 treewide: convert configureFlags to wafConfigureFlags when appropriate 2023-09-06 10:41:28 -03:00
Anderson Torres
f2f9262b92 treewide: waf.hook -> wafHook 2023-09-06 10:41:28 -03:00
Anderson Torres
9f52275e52 treewide: change wafConfigureFlags to configureFlags
Because it makes no sense to treat it differently.
2023-09-01 15:21:21 +00:00
github-actions[bot]
ce84b1371f
Merge master into staging-next 2023-08-31 00:01:54 +00:00
Anderson Torres
a10cefb38a samba4: change wafHook to waf.hook 2023-08-26 13:12:09 +00:00
R. Ryantm
59c8dfbe6a samba: 4.18.5 -> 4.18.6 2023-08-22 21:53:26 +00:00
Mats
74bec51799 samba: 4.17.7 -> 4.18.5 2023-07-20 17:02:20 +02:00
Thomas Gerbet
3d87d858cb samba: 4.17.5 -> 4.17.7
Fixes CVE-2023-0225, CVE-2023-0922 and CVE-2023-0614.

Release notes:
https://www.samba.org/samba/history/samba-4.17.7.html
https://www.samba.org/samba/history/samba-4.17.6.html
2023-04-11 22:35:02 +02:00
Weijia Wang
0a7667609f samba: unbreak on darwin 2023-03-17 23:50:16 +02:00
Lassulus
7b2a482ea0
Merge pull request #208795 from wucke13/dev/wucke13/fix-sssd 2023-02-09 20:50:56 +05:30
Sam Doshi
25ae7df30e samba: 4.17.4 -> 4.17.5 2023-02-04 16:56:05 +00:00
Wanja Zaeske
9b4cf10855 samba: etc
Makes samba use the nix vendored `talloc` instead of compiling its own,
bundleded version. This fixes an issue where the library may be initialized
with different magic numbers, resulting in segfaults. See in
https://github.com/NixOS/nixpkgs/issues/205859 for further detail.
2023-01-15 22:22:06 +01:00
Weijia Wang
5f40e9e178
samba: add darwin support (#207465) 2023-01-03 23:16:35 +01:00
R. Ryantm
555ba58408 samba: 4.17.3 -> 4.17.4 2022-12-26 12:58:20 +01:00
Monson Shao
0f96e0860c
samba: add notes for darwin 2022-11-23 16:15:00 +08:00
Yureka
29b2098551
samba: explicitly enable libunwind (#201875)
fixes build of pkgsMusl.samba
2022-11-22 13:11:23 +01:00
ajs124
ebf9fcd06d
Merge pull request #201553 from NixOS/upd/samba4
samba4: 4.17.2 -> 4.17.3
2022-11-17 01:03:03 +01:00
Janne Heß
667767d439
samba4: 4.17.2 -> 4.17.3 2022-11-16 22:06:50 +01:00
Ben Wolsieffer
118e531c2d samba: fix cross-compilation
The last update mistakenly removed wafHook and the patch required to make cross-
compilation work. In addition, the bundled version of heimdal is now too new to
work with asn1_compile from the heimdal package in nixpkgs (it isn't out of
date, there just hasn't been a release in years and samba uses an unreleased
version).

To fix the latter issue, the native build of samba saves asn1_compile and
compile_et from the bundled heimdal into the dev output, allowing them to be
available at build time when cross-compiling.
2022-11-13 17:46:25 -05:00
ajs124
83b70c04c8 samba4: 4.15.9 -> 4.17.2
- package uses the vendored heimdal kerberos now
- does not call waf directly anymore, because it complained
- a lot of upstream releases:
  - https://www.samba.org/samba/history/samba-4.16.0.html
  - https://www.samba.org/samba/history/samba-4.17.0.html
  - https://www.samba.org/samba/history/samba-4.17.1.html
  - https://www.samba.org/samba/history/samba-4.17.2.html
2022-11-10 14:26:02 +01:00
Artturin
7e49471316 treewide: optional -> optionals where the argument is a list
the argument to optional should not be list
2022-10-10 15:40:21 +03:00
Robert Scott
755e7195b2 samba: 4.15.5 -> 4.15.9 2022-09-11 22:20:23 +01:00
Artturin
8ea56dfc8f samba: don't depend on build python3
add disallowedReferences to prevent future regressions

buildPackages.python3Packages.python.intepreter will be python3.10 while
the one in shebang is python3

had to move the substituting to after wrapPythonPrograms because the
wrapper contained build python so something weird is going on
2022-08-31 21:40:44 +03:00
Martin Weinelt
d4aac5cd60 samba: 4.15.3 -> 4.15.5
https://www.openwall.com/lists/oss-security/2022/02/01/1

Fixes: CVE-2021-44141, CVE-2021-44142, CEV-2022-0336
(cherry picked from commit da86fe2cd6)
2022-02-01 19:17:29 +01:00
R. Ryantm
1bbb08976f samba: 4.15.2 -> 4.15.3
(cherry picked from commit 886235de96)
2022-02-01 19:17:23 +01:00
R. Ryantm
39d9d22eec samba: 4.15.1 -> 4.15.2 2021-12-07 00:50:38 +00:00
Maximilian Bosch
8464356564
Merge pull request #143544 from r-ryantm/auto-update/samba
samba: 4.15.0 -> 4.15.1
2021-11-12 11:13:06 +01:00
Janne Heß
ce5f4a0dbf
Merge pull request #144948 from helsinki-systems/feat/samba-patch-all-libs
samba4: Fix all libraries
2021-11-09 12:33:38 +01:00