shishi: Modernize Build
This commit is contained in:
parent
bc8bbd5281
commit
44aad3817f
|
@ -1,5 +1,25 @@
|
||||||
{ fetchurl, stdenv, libtasn1, libgcrypt, gnutls }:
|
{ stdenv, fetchurl
|
||||||
|
, libgcrypt, libgpgerror, libtasn1
|
||||||
|
|
||||||
|
# Optional Dependencies
|
||||||
|
, pam ? null, libidn ? null, gnutls ? null
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
mkFlag = trueStr: falseStr: cond: name: val:
|
||||||
|
if cond == null then null else
|
||||||
|
"--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
|
||||||
|
mkEnable = mkFlag "enable-" "disable-";
|
||||||
|
mkWith = mkFlag "with-" "without-";
|
||||||
|
mkOther = mkFlag "" "" true;
|
||||||
|
|
||||||
|
shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
|
||||||
|
|
||||||
|
optPam = shouldUsePkg pam;
|
||||||
|
optLibidn = shouldUsePkg libidn;
|
||||||
|
optGnutls = shouldUsePkg gnutls;
|
||||||
|
in
|
||||||
|
with stdenv.lib;
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "shishi-1.0.2";
|
name = "shishi-1.0.2";
|
||||||
|
|
||||||
|
@ -8,30 +28,52 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d";
|
sha256 = "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ libtasn1 libgcrypt gnutls ] ;
|
# Fixes support for gcrypt 1.6+
|
||||||
|
patches = [ ./gcrypt-fix.patch ];
|
||||||
|
|
||||||
|
buildInputs = [ libgcrypt libgpgerror libtasn1 optPam optLibidn optGnutls ];
|
||||||
|
|
||||||
|
configureFlags = [
|
||||||
|
(mkOther "sysconfdir" "/etc")
|
||||||
|
(mkOther "localstatedir" "/var")
|
||||||
|
(mkEnable true "libgcrypt" null)
|
||||||
|
(mkEnable (optPam != null) "pam" null)
|
||||||
|
(mkEnable true "ipv6" null)
|
||||||
|
(mkWith (optLibidn != null) "stringprep" null)
|
||||||
|
(mkEnable (optGnutls != null) "starttls" null)
|
||||||
|
(mkEnable true "des" null)
|
||||||
|
(mkEnable true "3des" null)
|
||||||
|
(mkEnable true "aes" null)
|
||||||
|
(mkEnable true "md" null)
|
||||||
|
(mkEnable false "null" null)
|
||||||
|
(mkEnable true "arcfour" null)
|
||||||
|
];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE
|
NIX_CFLAGS_COMPILE
|
||||||
= stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT";
|
= optionalString stdenv.isDarwin "-DBIND_8_COMPAT";
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
meta = {
|
installFlags = [ "sysconfdir=\${out}/etc" ];
|
||||||
description = "An implementation of the Kerberos 5 network security system";
|
|
||||||
homepage = http://www.gnu.org/software/shishi/;
|
|
||||||
license = stdenv.lib.licenses.gpl3Plus;
|
|
||||||
maintainers = with stdenv.lib.maintainers; [ bjg lovek323 ];
|
|
||||||
platforms = stdenv.lib.platforms.all;
|
|
||||||
|
|
||||||
longDescription =
|
# Fix *.la files
|
||||||
'' GNU Shishi is an implementation of the Kerberos 5 network
|
postInstall = ''
|
||||||
authentication system, as specified in RFC 4120. Shishi can be
|
sed -i $out/lib/libshi{sa,shi}.la \
|
||||||
used to authenticate users in distributed systems.
|
'' + optionalString (optLibidn != null) ''
|
||||||
|
-e 's,\(-lidn\),-L${optLibidn}/lib \1,' \
|
||||||
Shishi contains a library (`libshishi') that can be used by
|
'' + optionalString (optGnutls != null) ''
|
||||||
application developers to add support for Kerberos 5. Shishi
|
-e 's,\(-lgnutls\),-L${optGnutls}/lib \1,' \
|
||||||
contains a command line utility (1shishi') that is used by
|
'' + ''
|
||||||
users to acquire and manage tickets (and more). The server
|
-e 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' \
|
||||||
side, a Key Distribution Center, is implemented by `shishid'.
|
-e 's,\(-lgpg-error\),-L${libgpgerror}/lib \1,' \
|
||||||
|
-e 's,\(-ltasn1\),-L${libtasn1}/lib \1,'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = http://www.gnu.org/software/shishi/;
|
||||||
|
description = "An implementation of the Kerberos 5 network security system";
|
||||||
|
license = licenses.gpl3Plus;
|
||||||
|
maintainers = with maintainers; [ bjg lovek323 wkennington ];
|
||||||
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
34
pkgs/servers/shishi/gcrypt-fix.patch
Normal file
34
pkgs/servers/shishi/gcrypt-fix.patch
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
diff --git a/configure b/configure
|
||||||
|
index c9a442b..a596bfe 100755
|
||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -24491,12 +24491,6 @@ else
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
#include <gcrypt.h>
|
||||||
|
-/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c
|
||||||
|
- will fail on startup if we don't have 1.4.4 or later, so
|
||||||
|
- test for it early. */
|
||||||
|
-#if !defined GCRY_MODULE_ID_USER
|
||||||
|
-error too old libgcrypt
|
||||||
|
-#endif
|
||||||
|
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
diff --git a/gl/m4/gc.m4 b/gl/m4/gc.m4
|
||||||
|
index b352e33..4bab9f4 100644
|
||||||
|
--- a/gl/m4/gc.m4
|
||||||
|
+++ b/gl/m4/gc.m4
|
||||||
|
@@ -12,12 +12,6 @@ AC_DEFUN([gl_GC],
|
||||||
|
if test "$libgcrypt" != no; then
|
||||||
|
AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [
|
||||||
|
#include <gcrypt.h>
|
||||||
|
-/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c
|
||||||
|
- will fail on startup if we don't have 1.4.4 or later, so
|
||||||
|
- test for it early. */
|
||||||
|
-#if !defined GCRY_MODULE_ID_USER
|
||||||
|
-error too old libgcrypt
|
||||||
|
-#endif
|
||||||
|
])
|
||||||
|
fi
|
||||||
|
])
|
Loading…
Reference in a new issue