From 89e34644d94860fafc053b759961ba8b55a6c77c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 18 Jan 2017 09:57:43 +0100 Subject: gnu: Move Kerberos implemetations to (gnu packages kerberos). * gnu/packages/mit-krb5.scm: Remove. * gnu/packages/shishi.scm: Remove. * gnu/packages/kerberos.scm: New file, from the concatenation of these two. * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly. * gnu/packages/admin.scm, gnu/packages/cyrus-sasl.scm, gnu/packages/gnome.scm, gnu/packages/gnuzilla.scm, gnu/packages/gsasl.scm, gnu/packages/java.scm, gnu/packages/networking.scm, gnu/packages/nfs.scm, gnu/packages/onc-rpc.scm, gnu/packages/ssh.scm, gnu/packages/web.scm: Adjust accordingly. --- gnu/packages/admin.scm | 4 +- gnu/packages/cyrus-sasl.scm | 4 +- gnu/packages/gnome.scm | 4 +- gnu/packages/gnuzilla.scm | 4 +- gnu/packages/gsasl.scm | 2 +- gnu/packages/java.scm | 2 +- gnu/packages/kerberos.scm | 131 ++++++++++++++++++++++++++++++++++++++++++++ gnu/packages/mit-krb5.scm | 86 ----------------------------- gnu/packages/networking.scm | 4 +- gnu/packages/nfs.scm | 2 +- gnu/packages/onc-rpc.scm | 4 +- gnu/packages/shishi.scm | 70 ----------------------- gnu/packages/ssh.scm | 4 +- gnu/packages/web.scm | 4 +- 14 files changed, 150 insertions(+), 175 deletions(-) create mode 100644 gnu/packages/kerberos.scm delete mode 100644 gnu/packages/mit-krb5.scm delete mode 100644 gnu/packages/shishi.scm (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index def9a6fbf3..b4695dc1e7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2014, 2015, 2016 Eric Bavier @@ -75,7 +75,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages man) #:use-module (gnu packages autotools) #:use-module (gnu packages gnome) - #:use-module (gnu packages mit-krb5) + #:use-module (gnu packages kerberos) #:use-module (gnu packages gtk)) (define-public aide diff --git a/gnu/packages/cyrus-sasl.scm b/gnu/packages/cyrus-sasl.scm index 89a4a49797..62bd718ab9 100644 --- a/gnu/packages/cyrus-sasl.scm +++ b/gnu/packages/cyrus-sasl.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2017 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2016 Leo Famulari ;;; @@ -21,7 +21,7 @@ (define-module (gnu packages cyrus-sasl) #:use-module (gnu packages) #:use-module (gnu packages databases) - #:use-module (gnu packages mit-krb5) + #:use-module (gnu packages kerberos) #:use-module (gnu packages tls) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e279ef7ed6..f6f7aae696 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge -;;; Copyright © 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2014, 2016 Eric Bavier ;;; Copyright © 2014, 2015 Federico Beffa @@ -110,7 +110,7 @@ (define-module (gnu packages gnome) #:use-module (gnu packages xdisorg) #:use-module (gnu packages freedesktop) #:use-module (gnu packages mail) - #:use-module (gnu packages mit-krb5) + #:use-module (gnu packages kerberos) #:use-module (gnu packages multiprecision) #:use-module (gnu packages backup) #:use-module (gnu packages nettle) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index e5388b42a3..678dc4e27f 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge -;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2016 Efraim Flashner @@ -36,7 +36,7 @@ (define-module (gnu packages gnuzilla) #:use-module (gnu packages gnome) #:use-module (gnu packages libcanberra) #:use-module (gnu packages cups) - #:use-module (gnu packages mit-krb5) + #:use-module (gnu packages kerberos) #:use-module (gnu packages linux) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm index ce39aed655..4c8f818f91 100644 --- a/gnu/packages/gsasl.scm +++ b/gnu/packages/gsasl.scm @@ -21,7 +21,7 @@ (define-module (gnu packages gsasl) #:use-module (gnu packages compression) #:use-module (gnu packages libidn) #:use-module (gnu packages nettle) - #:use-module (gnu packages shishi) + #:use-module (gnu packages kerberos) #:use-module (gnu packages tls) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3a08fd83a8..d7df4f6bad 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -47,7 +47,7 @@ (define-module (gnu packages java) #:use-module (gnu packages wget) #:use-module (gnu packages pkg-config) #:use-module (gnu packages perl) - #:use-module (gnu packages mit-krb5) + #:use-module (gnu packages kerberos) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages zip) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm new file mode 100644 index 0000000000..3178784f92 --- /dev/null +++ b/gnu/packages/kerberos.scm @@ -0,0 +1,131 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2012, 2013 Andreas Enge +;;; Copyright © 2014, 2015, 2016 Mark H Weaver +;;; Copyright © 2016 Leo Famulari +;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2012, 2013 Nikita Karetnikov +;;; Copyright © 2012 Ludovic Courtès +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages kerberos) + #:use-module (gnu packages) + #:use-module (gnu packages bison) + #:use-module (gnu packages perl) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages libidn) + #:use-module (gnu packages linux) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages compression) + #:use-module (gnu packages tls) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix utils) + #:use-module (guix build-system gnu)) + +(define-public mit-krb5 + (package + (name "mit-krb5") + (version "1.14.3") + (source (origin + (method url-fetch) + (uri (string-append "http://web.mit.edu/kerberos/dist/krb5/" + (version-major+minor version) + "/krb5-" version ".tar.gz")) + (sha256 + (base32 + "1jgjiyh1sp72lkxvk437lz5hzcibvw99jc4ihzfz03fg43aj0ind")))) + (build-system gnu-build-system) + (native-inputs + `(("bison" ,bison) + ("perl" ,perl))) + (arguments + `(;; Work around "No rule to make target '../../include/gssapi/gssapi.h', + ;; needed by 'authgss_prot.so'." + #:parallel-build? #f + + ;; Likewise with tests. + #:parallel-tests? #f + + ;; XXX: On 32-bit systems, 'kdb5_util' hangs on an fcntl/F_SETLKW call + ;; while running the tests in 'src/tests'. + #:tests? ,(string=? (%current-system) "x86_64-linux") + + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'enter-source-directory + (lambda _ + (chdir "src") + #t)) + (add-before 'check 'pre-check + (lambda* (#:key inputs #:allow-other-keys) + (let ((perl (assoc-ref inputs "perl"))) + (substitute* "plugins/kdb/db2/libdb2/test/run.test" + (("/bin/cat") (string-append perl "/bin/perl")) + (("D/bin/sh") (string-append "D" (which "bash"))) + (("bindir=/bin/.") (string-append "bindir=" perl "/bin")))) + + ;; avoid service names since /etc/services is unavailable + (substitute* "tests/resolve/Makefile" + (("-p telnet") "-p 23")) + #t))))) + (synopsis "MIT Kerberos 5") + (description + "Massachusetts Institute of Technology implementation of Kerberos. +Kerberos is a network authentication protocol designed to provide strong +authentication for client/server applications by using secret-key +cryptography.") + (license (license:non-copyleft "file://NOTICE" + "See NOTICE in the distribution.")) + (home-page "http://web.mit.edu/kerberos/"))) + +(define-public shishi + (package + (name "shishi") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/shishi/shishi-" + version ".tar.gz")) + (sha256 + (base32 + "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d")))) + (build-system gnu-build-system) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("gnutls" ,gnutls) + ("libidn" ,libidn) + ("linux-pam" ,linux-pam-1.2) + ("zlib" ,zlib) + ;; libgcrypt 1.6 fails because of the following test: + ;; #include + ;; /* 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 + ("libgcrypt" ,libgcrypt-1.5) + ("libtasn1" ,libtasn1))) + (home-page "http://www.gnu.org/software/shishi/") + (synopsis "Implementation of the Kerberos 5 network security system") + (description + "GNU Shishi is a free implementation of the Kerberos 5 network security +system. It is used to allow non-secure network nodes to communicate in a +secure manner through client-server mutual authentication via tickets.") + (license license:gpl3+))) diff --git a/gnu/packages/mit-krb5.scm b/gnu/packages/mit-krb5.scm deleted file mode 100644 index 3299c7b5c4..0000000000 --- a/gnu/packages/mit-krb5.scm +++ /dev/null @@ -1,86 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013 Andreas Enge -;;; Copyright © 2015, 2016 Mark H Weaver -;;; Copyright © 2016 Leo Famulari -;;; Copyright © 2016 Efraim Flashner -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages mit-krb5) - #:use-module (gnu packages) - #:use-module (gnu packages bison) - #:use-module (gnu packages perl) - #:use-module (guix licenses) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix utils) - #:use-module (guix build-system gnu)) - -(define-public mit-krb5 - (package - (name "mit-krb5") - (version "1.14.3") - (source (origin - (method url-fetch) - (uri (string-append "http://web.mit.edu/kerberos/dist/krb5/" - (version-major+minor version) - "/krb5-" version ".tar.gz")) - (sha256 - (base32 - "1jgjiyh1sp72lkxvk437lz5hzcibvw99jc4ihzfz03fg43aj0ind")))) - (build-system gnu-build-system) - (native-inputs - `(("bison" ,bison) - ("perl" ,perl))) - (arguments - `(;; Work around "No rule to make target '../../include/gssapi/gssapi.h', - ;; needed by 'authgss_prot.so'." - #:parallel-build? #f - - ;; Likewise with tests. - #:parallel-tests? #f - - ;; XXX: On 32-bit systems, 'kdb5_util' hangs on an fcntl/F_SETLKW call - ;; while running the tests in 'src/tests'. - #:tests? ,(string=? (%current-system) "x86_64-linux") - - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'enter-source-directory - (lambda _ - (chdir "src") - #t)) - (add-before 'check 'pre-check - (lambda* (#:key inputs #:allow-other-keys) - (let ((perl (assoc-ref inputs "perl"))) - (substitute* "plugins/kdb/db2/libdb2/test/run.test" - (("/bin/cat") (string-append perl "/bin/perl")) - (("D/bin/sh") (string-append "D" (which "bash"))) - (("bindir=/bin/.") (string-append "bindir=" perl "/bin")))) - - ;; avoid service names since /etc/services is unavailable - (substitute* "tests/resolve/Makefile" - (("-p telnet") "-p 23")) - #t))))) - (synopsis "MIT Kerberos 5") - (description - "Massachusetts Institute of Technology implementation of Kerberos. -Kerberos is a network authentication protocol designed to provide strong -authentication for client/server applications by using secret-key -cryptography.") - (license (non-copyleft "file://NOTICE" - "See NOTICE in the distribution.")) - (home-page "http://web.mit.edu/kerberos/"))) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 982ae0a655..87ee0a1d8e 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014 Ludovic Courtès +;;; Copyright © 2014, 2017 Ludovic Courtès ;;; Copyright © 2015, 2016 Ricardo Wurmus ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015, 2016 Stefan Reichör @@ -53,7 +53,7 @@ (define-module (gnu packages networking) #:use-module (gnu packages libidn) #:use-module (gnu packages linux) #:use-module (gnu packages lua) - #:use-module (gnu packages mit-krb5) + #:use-module (gnu packages kerberos) #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm index 650a2af0d6..f18fe6cb51 100644 --- a/gnu/packages/nfs.scm +++ b/gnu/packages/nfs.scm @@ -22,7 +22,7 @@ (define-module (gnu packages nfs) #:use-module (gnu packages databases) #:use-module (gnu packages gsasl) #:use-module (gnu packages libevent) - #:use-module (gnu packages mit-krb5) + #:use-module (gnu packages kerberos) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages pkg-config) #:use-module (guix build-system cmake) diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index 5353846ece..5f67823a40 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014 Ludovic Courtès +;;; Copyright © 2014, 2017 Ludovic Courtès ;;; Copyright © 2016 John Darrington ;;; ;;; This file is part of GNU Guix. @@ -21,7 +21,7 @@ (define-module (gnu packages onc-rpc) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) - #:use-module (gnu packages mit-krb5) + #:use-module (gnu packages kerberos) #:use-module (gnu packages pkg-config) #:use-module (guix build-system gnu)) diff --git a/gnu/packages/shishi.scm b/gnu/packages/shishi.scm deleted file mode 100644 index 7e02843d38..0000000000 --- a/gnu/packages/shishi.scm +++ /dev/null @@ -1,70 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013 Nikita Karetnikov -;;; Copyright © 2012 Ludovic Courtès -;;; Copyright © 2014 Mark H Weaver -;;; Copyright © 2016 Efraim Flashner -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages shishi) - #:use-module ((guix licenses) #:select (gpl3+)) - #:use-module (gnu packages) - #:use-module (gnu packages gnupg) - #:use-module (gnu packages libidn) - #:use-module (gnu packages linux) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages compression) - #:use-module (gnu packages tls) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu)) - -(define-public shishi - (package - (name "shishi") - (version "1.0.2") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/shishi/shishi-" - version ".tar.gz")) - (sha256 - (base32 - "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d")))) - (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs - `(("gnutls" ,gnutls) - ("libidn" ,libidn) - ("linux-pam" ,linux-pam-1.2) - ("zlib" ,zlib) - ;; libgcrypt 1.6 fails because of the following test: - ;; #include - ;; /* 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 - ("libgcrypt" ,libgcrypt-1.5) - ("libtasn1" ,libtasn1))) - (home-page "http://www.gnu.org/software/shishi/") - (synopsis "Implementation of the Kerberos 5 network security system") - (description - "GNU Shishi is a free implementation of the Kerberos 5 network security -system. It is used to allow non-secure network nodes to communicate in a -secure manner through client-server mutual authentication via tickets.") - (license gpl3+))) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 0fe6598bb2..9d1d9cc0a9 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015, 2016 Efraim Flashner @@ -38,7 +38,7 @@ (define-module (gnu packages ssh) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) - #:use-module (gnu packages mit-krb5) + #:use-module (gnu packages kerberos) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:autoload (gnu packages protobuf) (protobuf) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b94c6c0c83..c62acbd5b3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2013 Aljosha Papsch -;;; Copyright © 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015, 2016 Ricardo Wurmus ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer @@ -58,7 +58,7 @@ (define-module (gnu packages web) #:use-module (gnu packages databases) #:use-module (gnu packages bison) #:use-module (gnu packages flex) - #:use-module (gnu packages mit-krb5) + #:use-module (gnu packages kerberos) #:use-module (gnu packages gd) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) -- cgit v1.2.3