[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: gnu: Move Kerberos implemetations to (gnu packages kerberos).
|
From: |
Ludovic Courtès |
|
Subject: |
01/03: gnu: Move Kerberos implemetations to (gnu packages kerberos). |
|
Date: |
Wed, 18 Jan 2017 23:11:57 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit 89e34644d94860fafc053b759961ba8b55a6c77c
Author: Ludovic Courtès <address@hidden>
Date: Wed Jan 18 09:57:43 2017 +0100
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/local.mk | 5 +-
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/{mit-krb5.scm => kerberos.scm} | 55 +++++++++++++++++++--
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, 71 insertions(+), 97 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 7903188..217d317 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
+# Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès
<address@hidden>
# Copyright © 2013, 2014, 2015, 2016 Andreas Enge <address@hidden>
# Copyright © 2016 Mathieu Lirzin <address@hidden>
# Copyright © 2013, 2014, 2015, 2016 Mark H Weaver <address@hidden>
@@ -199,6 +199,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/julia.scm \
%D%/packages/kde.scm \
%D%/packages/kde-frameworks.scm \
+ %D%/packages/kerberos.scm \
%D%/packages/key-mon.scm \
%D%/packages/kodi.scm \
%D%/packages/language.scm \
@@ -252,7 +253,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/mingw.scm \
%D%/packages/mg.scm \
%D%/packages/microcom.scm \
- %D%/packages/mit-krb5.scm \
%D%/packages/moe.scm \
%D%/packages/monitoring.scm \
%D%/packages/mono.scm \
@@ -339,7 +339,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/serveez.scm \
%D%/packages/shells.scm \
%D%/packages/shellutils.scm \
- %D%/packages/shishi.scm \
%D%/packages/skarnet.scm \
%D%/packages/skribilo.scm \
%D%/packages/slang.scm \
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index def9a6f..b4695dc 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 <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès
<address@hidden>
;;; Copyright © 2013 Cyril Roelandt <address@hidden>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <address@hidden>
;;; Copyright © 2014, 2015, 2016 Eric Bavier <address@hidden>
@@ -75,7 +75,7 @@
#: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 89a4a49..62bd718 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 <address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2017 Ludovic Courtès <address@hidden>
;;; Copyright © 2013 Andreas Enge <address@hidden>
;;; Copyright © 2016 Leo Famulari <address@hidden>
;;;
@@ -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 e279ef7..f6f7aae 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 <address@hidden>
-;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
;;; Copyright © 2014 Ian Denhardt <address@hidden>
;;; Copyright © 2014, 2016 Eric Bavier <address@hidden>
;;; Copyright © 2014, 2015 Federico Beffa <address@hidden>
@@ -110,7 +110,7 @@
#: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 e5388b4..678dc4e 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 <address@hidden>
-;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <address@hidden>
;;; Copyright © 2015 Sou Bunnbu <address@hidden>
;;; Copyright © 2016 Efraim Flashner <address@hidden>
@@ -36,7 +36,7 @@
#: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 ce39aed..4c8f818 100644
--- a/gnu/packages/gsasl.scm
+++ b/gnu/packages/gsasl.scm
@@ -21,7 +21,7 @@
#: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 3a08fd8..d7df4f6 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -47,7 +47,7 @@
#: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/mit-krb5.scm b/gnu/packages/kerberos.scm
similarity index 61%
rename from gnu/packages/mit-krb5.scm
rename to gnu/packages/kerberos.scm
index 3299c7b..3178784 100644
--- a/gnu/packages/mit-krb5.scm
+++ b/gnu/packages/kerberos.scm
@@ -1,8 +1,10 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013 Andreas Enge <address@hidden>
-;;; Copyright © 2015, 2016 Mark H Weaver <address@hidden>
+;;; Copyright © 2014, 2015, 2016 Mark H Weaver <address@hidden>
;;; Copyright © 2016 Leo Famulari <address@hidden>
;;; Copyright © 2016 Efraim Flashner <address@hidden>
+;;; Copyright © 2012, 2013 Nikita Karetnikov <address@hidden>
+;;; Copyright © 2012 Ludovic Courtès <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -19,11 +21,17 @@
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
-(define-module (gnu packages mit-krb5)
+(define-module (gnu packages kerberos)
#:use-module (gnu packages)
#:use-module (gnu packages bison)
#:use-module (gnu packages perl)
- #:use-module (guix licenses)
+ #: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)
@@ -81,6 +89,43 @@
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."))
+ (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 <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
+ ("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/networking.scm b/gnu/packages/networking.scm
index 982ae0a..87ee0a1 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 <address@hidden>
+;;; Copyright © 2014, 2017 Ludovic Courtès <address@hidden>
;;; Copyright © 2015, 2016 Ricardo Wurmus <address@hidden>
;;; Copyright © 2015 Mark H Weaver <address@hidden>
;;; Copyright © 2015, 2016 Stefan Reichör <address@hidden>
@@ -53,7 +53,7 @@
#: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 650a2af..f18fe6c 100644
--- a/gnu/packages/nfs.scm
+++ b/gnu/packages/nfs.scm
@@ -22,7 +22,7 @@
#: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 5353846..5f67823 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 <address@hidden>
+;;; Copyright © 2014, 2017 Ludovic Courtès <address@hidden>
;;; Copyright © 2016 John Darrington <address@hidden>
;;;
;;; This file is part of GNU Guix.
@@ -21,7 +21,7 @@
#: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 7e02843..0000000
--- a/gnu/packages/shishi.scm
+++ /dev/null
@@ -1,70 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013 Nikita Karetnikov <address@hidden>
-;;; Copyright © 2012 Ludovic Courtès <address@hidden>
-;;; Copyright © 2014 Mark H Weaver <address@hidden>
-;;; Copyright © 2016 Efraim Flashner <address@hidden>
-;;;
-;;; 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 <http://www.gnu.org/licenses/>.
-
-(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 <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
- ("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 0fe6598..9d1d9cc 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 <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès
<address@hidden>
;;; Copyright © 2013, 2014 Andreas Enge <address@hidden>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <address@hidden>
;;; Copyright © 2015, 2016 Efraim Flashner <address@hidden>
@@ -38,7 +38,7 @@
#: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 b94c6c0..c62acbd 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 <address@hidden>
;;; Copyright © 2013 Aljosha Papsch <address@hidden>
-;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <address@hidden>
;;; Copyright © 2015, 2016 Ricardo Wurmus <address@hidden>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <address@hidden>
@@ -58,7 +58,7 @@
#: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)