Re: [PATCH] gnu: Add httpd

[Aljosha Papsch <lists@rpapsch.de>]

[-- Attachment #1.1: Type: text/plain, Size: 1393 bytes --]

Am Sonntag, den 29.09.2013, 19:19 +0200 schrieb Ludovic Courtès:
> Hi,
> Please just write just “Add httpd” in the subject line, and write the
> rest of the log in the body, one line per thing.

I guess I forgot a newline, fixed.

> Please do not use tabs in .scm files (for Emacs there’s a .dir-locals.el
> file that should set it up.)

I began writing the file outside the Guix tree, so Emacs didn't pick it
up. Fixed as well.

> > +   (arguments
> > +    `(#:tests? #f
> 
> Usually we try to fix any test suite issues, but sometimes we end up
> disabling it altogether when that’s really too much effort or when we’re
> waiting for feedback from upstream.
> 
> What problems did you encounter?  A typical issue with networking
> packages is that tests try to perform DNS lookups, which doesn’t work in
> our chroot build environment.  Often that can be worked around, for
> instance by replacing ‘localhost’ with ‘127.0.0.1’.

I didn't encounter any problems.  Httpd only provides a „test“ target,
which does nothing:

starting phase `check'
make: Nothing to be done for `test'.
phase `check' succeeded after 0 seconds

I changed it to #:test-target "test" though.

> “Featureful HTTP server” should be enough.

Changed as well. The new patch is attached.

Best regards.

-- 
GPG: 4F20BC96
http://rpapsch.de/gpg.asc


[-- Attachment #1.2: 0001-Add-httpd.patch --]
[-- Type: text/x-patch, Size: 3860 bytes --]

From 2ddaaafbed231b9d2c1e8506e8da7a9c97b01297 Mon Sep 17 00:00:00 2001
From: Aljosha Papsch <misc@rpapsch.de>
Date: Sun, 29 Sep 2013 20:55:47 +0200
Subject: [PATCH] Add httpd

* gnu/packages/web.scm (httpd): New variable
* gnu-system.am (GNU_SYSTEM_MODULES): Add it
---
 gnu-system.am        |  1 +
 gnu/packages/web.scm | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 gnu/packages/web.scm

diff --git a/gnu-system.am b/gnu-system.am
index 973ba77..f3c0e7d 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -172,6 +172,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/vpn.scm				\
   gnu/packages/w3m.scm				\
   gnu/packages/wdiff.scm			\
+  gnu/packages/web.scm                          \
   gnu/packages/wget.scm				\
   gnu/packages/which.scm			\
   gnu/packages/wordnet.scm			\
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
new file mode 100644
index 0000000..b967a91
--- /dev/null
+++ b/gnu/packages/web.scm
@@ -0,0 +1,64 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Aljosha Papsch <misc@rpapsch.de>
+;;;
+;;; 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 web)
+  #:use-module ((guix licenses)
+                #:renamer (symbol-prefix-proc 'l:))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages apr)
+  #:use-module (gnu packages openssl)
+  #:use-module (gnu packages pcre))
+
+(define-public httpd
+  (package
+    (name "httpd")
+    (version "2.4.6")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://apache/httpd/httpd-"
+                                 version ".tar.bz2"))
+             (sha256
+              (base32
+               "1sig08xxq1kqxr2a42ndwr9g4mm6zdqnxldhxraym2y0xcjkd7yw"))))
+    (build-system gnu-build-system)
+    (inputs `(("apr" ,apr)
+              ("apr-util" ,apr-util)
+              ("openssl" ,openssl)
+              ("pcre" ,pcre)))
+    (arguments
+     `(#:test-target "test"
+       #:configure-flags (list "--enable-rewrite"
+                               "--enable-userdir"
+                               "--enable-vhost-alias"
+                               "--enable-ssl"
+                               "--enable-mime-magic"
+                               (string-append "--sysconfdir="
+                                              (assoc-ref %outputs "out")
+                                              "/etc/httpd"))))
+    (synopsis "Featureful HTTP server")
+    (description
+     "The Apache HTTP Server Project is a collaborative software development
+effort aimed at creating a robust, commercial-grade, featureful, and
+freely-available source code implementation of an HTTP (Web) server. The project
+is jointly managed by a group of volunteers located around the world, using the
+Internet and the Web to communicate, plan, and develop the server and its
+related documentation.")
+    (license l:asl2.0)
+    (home-page "https://httpd.apache.org/")))
-- 
1.8.3.1


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]