Re: [PATCH] Add mcrypt

2014-05-24 Thread Andreas Enge
On Sat, May 24, 2014 at 12:40:31AM -0500, Eric Bavier wrote:
 +(native-inputs `((file ,file)))
 +(arguments
 + `(#:phases (alist-cons-before
 + 'configure 'patch-configure
 + (lambda _
 +   (substitute* configure
 + ((/usr/bin/file)
 +  (which file
 + %standard-phases)))

Is this really needed? Lots of packages using the autotools look for file,
and when it is not available, nothing bad seems to happen. I was told before
to just not bother.

Andreas




Re: [PATCH] Add mcrypt

2014-05-24 Thread Nikita Karetnikov
 This patch adds Mcrypt, and two library dependencies.  Comments
 welcome.

I believe the libraries should be listed in the commit message as new
variables.  Ludo, WDYT?

 +  (method url-fetch)
 +
 +  (uri (string-append mirror://sourceforge/mcrypt/mcrypt-

Extraneous newline.

 +(synopsis )

Empty synopsis.

 +   (perl ,perl))) ;for tests

Usually, one puts a space after ‘;’.


pgpuWGn3NA2pY.pgp
Description: PGP signature


Re: [PATCH] Add mcrypt

2014-05-24 Thread Taylan Ulrich Bayirli/Kammer
Nikita Karetnikov nik...@karetnikov.org writes:

 +   (perl ,perl))) ;for tests

 Usually, one puts a space after ‘;’.

Not according to http://mumble.net/~campbell/scheme/style.txt and
Emacs's M-; (which just follows that document anyway).

Taylan



Re: [PATCH] Add mcrypt

2014-05-24 Thread Ludovic Courtès
Taylan Ulrich Bayirli/Kammer taylanbayi...@gmail.com skribis:

 Nikita Karetnikov nik...@karetnikov.org writes:

 +   (perl ,perl))) ;for tests

 Usually, one puts a space after ‘;’.

 Not according to http://mumble.net/~campbell/scheme/style.txt and
 Emacs's M-; (which just follows that document anyway).

It reads:

  The only comments in which omission of a space between the semicolon
  and the text is acceptable are margin comments.

which I take as “it’s OK to have one space for margin comments as well”,
which is what I do.  :-)

I prefer it with the additional space, but I’m fine either way.

Ludo’.



Re: [PATCH] Add mcrypt

2014-05-24 Thread Ludovic Courtès
Andreas Enge andr...@enge.fr skribis:

 On Sat, May 24, 2014 at 12:40:31AM -0500, Eric Bavier wrote:
 +(native-inputs `((file ,file)))
 +(arguments
 + `(#:phases (alist-cons-before
 + 'configure 'patch-configure
 + (lambda _
 +   (substitute* configure
 + ((/usr/bin/file)
 +  (which file
 + %standard-phases)))

 Is this really needed? Lots of packages using the autotools look for file,
 and when it is not available, nothing bad seems to happen. I was told before
 to just not bother.

Agreed.

Nikita Karetnikov nik...@karetnikov.org skribis:

 This patch adds Mcrypt, and two library dependencies.  Comments
 welcome.

 I believe the libraries should be listed in the commit message as new
 variables.  Ludo, WDYT?

Agreed, in the subject line.

Ludo’.



[PATCH] Add mcrypt

2014-05-23 Thread Eric Bavier
This patch adds Mcrypt, and two library dependencies.  Comments welcome.

From 252fe352e78fab9a66d50049cdce561072ff29df Mon Sep 17 00:00:00 2001
From: Eric Bavier bav...@member.fsf.org
Date: Sat, 24 May 2014 00:27:34 -0500
Subject: [PATCH] gnu: Add mcrypt.

* gnu/packages/mcrypt.scm: New file.
* gnu/packages/patches/mhash-keygen-test-segfault.patch: New patch.
* gnu-system.am (GNU_SYSTEM_MODULES): Add file.
  (dist_patch_DATA): Add patch.
---
 gnu-system.am  |2 +
 gnu/packages/mcrypt.scm|  131 
 .../patches/mhash-keygen-test-segfault.patch   |   13 ++
 3 files changed, 146 insertions(+)
 create mode 100644 gnu/packages/mcrypt.scm
 create mode 100644 gnu/packages/patches/mhash-keygen-test-segfault.patch

diff --git a/gnu-system.am b/gnu-system.am
index d7ea31b..7eece81 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -151,6 +151,7 @@ GNU_SYSTEM_MODULES =\
   gnu/packages/make-bootstrap.scm		\
   gnu/packages/maths.scm			\
   gnu/packages/mc.scm\
+  gnu/packages/mcrypt.scm			\
   gnu/packages/messaging.scm			\
   gnu/packages/mit-krb5.scm			\
   gnu/packages/moe.scm\
@@ -320,6 +321,7 @@ dist_patch_DATA =		\
   gnu/packages/patches/make-impure-dirs.patch			\
   gnu/packages/patches/mc-fix-ncurses-build.patch		\
   gnu/packages/patches/mcron-install.patch			\
+  gnu/packages/patches/mhash-keygen-test-segfault.patch		\
   gnu/packages/patches/mit-krb5-init-fix.patch			\
   gnu/packages/patches/mpc123-initialize-ao.patch		\
   gnu/packages/patches/openssl-CVE-2010-5298.patch		\
diff --git a/gnu/packages/mcrypt.scm b/gnu/packages/mcrypt.scm
new file mode 100644
index 000..785eb83
--- /dev/null
+++ b/gnu/packages/mcrypt.scm
@@ -0,0 +1,131 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Eric Bavier bav...@member.fsf.org
+;;;
+;;; 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 mcrypt)
+  #:use-module (guix packages)
+  #:use-module ((guix licenses) #:select (gpl2+))
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages file))
+
+(define-public mcrypt
+  (package
+(name mcrypt)
+(version 2.6.8)
+(source
+ (origin
+  (method url-fetch)
+
+  (uri (string-append mirror://sourceforge/mcrypt/mcrypt-
+  version .tar.gz))
+  (sha256
+   (base32
+161031n1w9pb4yzz9i47szc12a4mwpcpvyxnvafsik2l9s2aliai
+(build-system gnu-build-system)
+(inputs
+ `((zlib ,zlib)
+   (libmcrypt ,libmcrypt)
+   (libmhash ,libmhash)))
+(home-page http://mcrypt.sourceforge.net/;)
+(synopsis )
+(description
+ MCrypt is a replacement for the old crypt() package and crypt(1)
+command, with extensions.  It allows developers to use a wide range of
+encryption functions, without making drastic changes to their code.  It allows
+users to encrypt files or data streams without having to be cryptographers.
+The companion to MCrypt is Libmcrypt, which contains the actual encryption
+functions themselves, and provides a standardized mechanism for accessing
+them.)
+(license gpl2+)))
+
+(define-public libmcrypt
+  (package
+(name libmcrypt)
+(version 2.5.8)
+(source
+ (origin
+  (method url-fetch)
+  (uri (string-append mirror://sourceforge/mcrypt/libmcrypt-
+  version .tar.gz))
+  (sha256
+   (base32
+0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4
+(build-system gnu-build-system)
+(native-inputs `((file ,file)))
+(arguments
+ `(#:phases (alist-cons-before
+ 'configure 'patch-configure
+ (lambda _
+   (substitute* configure
+ ((/usr/bin/file)
+  (which file
+ %standard-phases)))
+(home-page http://mcrypt.sourceforge.net/;)
+(synopsis Encryption algorithm library)
+(description
+ Libmcrypt is a data encryption library.  The library is thread safe and
+provides encryption and decryption functions.  This version of the library
+supports many encryption algorithms and encryption modes.