tjh.dev
popa3d: fix build on GCC 14
+22
-10
pkgs/by-name/po/popa3d/package.nix
+22
-10
pkgs/by-name/po/popa3d/package.nix
···
4
4
fetchurl,
5
5
openssl,
6
6
libxcrypt,
7
+
versionCheckHook,
7
8
}:
8
9
9
-
stdenv.mkDerivation rec {
10
+
stdenv.mkDerivation (finalAttrs: {
10
11
pname = "popa3d";
11
12
version = "1.0.3";
12
13
13
14
src = fetchurl {
14
-
url = "http://www.openwall.com/popa3d/${pname}-${version}.tar.gz";
15
-
sha256 = "1g48cd74sqhl496wmljhq44iyfpghaz363a1ip8nyhpjz7d57f03";
15
+
url = "http://www.openwall.com/popa3d/popa3d-${finalAttrs.version}.tar.gz";
16
+
hash = "sha256-A7hT2vnyQm/RjUENM76C7zofCcFQ0spNIhRiTU5jiLw=";
16
17
};
17
18
18
-
buildInputs = [
19
-
openssl
20
-
libxcrypt
21
-
];
22
-
23
19
patches = [
24
20
./fix-mail-spool-path.patch
25
21
./use-openssl.patch
···
27
23
./enable-standalone-mode.patch
28
24
];
29
25
30
-
configurePhase = ''makeFlags="PREFIX=$out MANDIR=$out/share/man"'';
26
+
enableParallelBuilding = true;
27
+
28
+
makeFlags = [
29
+
"PREFIX=$(out)"
30
+
"MANDIR=$(out)/share/man"
31
+
];
32
+
33
+
buildInputs = [
34
+
openssl
35
+
libxcrypt
36
+
];
37
+
38
+
nativeInstallCheckInputs = [
39
+
versionCheckHook
40
+
];
41
+
doInstallCheck = true;
42
+
versionCheckProgramArg = "-V";
31
43
32
44
meta = {
33
45
homepage = "http://www.openwall.com/popa3d/";
···
35
47
mainProgram = "popa3d";
36
48
platforms = lib.platforms.linux;
37
49
};
38
-
}
50
+
})
+13
pkgs/by-name/po/popa3d/use-glibc-crypt.patch
+13
pkgs/by-name/po/popa3d/use-glibc-crypt.patch
···
10
10
# HP-UX trusted system
11
11
#LIBS += -lsec
12
12
# Solaris (POP_STANDALONE, POP_VIRTUAL)
13
+
diff -ubr popa3d-1.0.2-orig/auth_shadow.c popa3d-1.0.2/auth_shadow.c
14
+
--- a/auth_shadow.c
15
+
+++ b/auth_shadow.c
16
+
@@ -14,8 +14,9 @@
17
+
#define _XOPEN_SOURCE 4
18
+
#define _XOPEN_SOURCE_EXTENDED
19
+
#define _XOPEN_VERSION 4
20
+
#define _XPG4_2
21
+
+#define _DEFAULT_SOURCE
22
+
#include <unistd.h>
23
+
#include <string.h>
24
+
#include <stdlib.h>
25
+
#include <pwd.h>