[PATCH] Add miniupnpc

[PATCH] Add miniupnpc

[Sree Harsha Totakura]

Sree Harsha Totakura (1):
  gnu: Add miniupnpc.

 gnu-system.am         |  1 +
 gnu/packages/upnp.scm | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 gnu/packages/upnp.scm

-- 
1.8.5.3

[PATCH] gnu: Add miniupnpc.

[Sree Harsha Totakura]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 3521 bytes --]

* gnu/packages/upnp.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am         |  1 +
 gnu/packages/upnp.scm | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 gnu/packages/upnp.scm

diff --git a/gnu-system.am b/gnu-system.am
index d231cfa..a521e42 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -203,6 +203,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/tor.scm				\
   gnu/packages/uucp.scm				\
   gnu/packages/unrtf.scm			\
+  gnu/packages/upnp.scm				\
   gnu/packages/valgrind.scm			\
   gnu/packages/version-control.scm		\
   gnu/packages/video.scm			\
diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm
new file mode 100644
index 0000000..a1471fc
--- /dev/null
+++ b/gnu/packages/upnp.scm
@@ -0,0 +1,66 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
+;;;
+;;; 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 upnp)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages python)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix download)
+  #:use-module (guix licenses)
+  #:use-module (guix packages))
+
+(define-public miniupnpc
+  (package
+    (name "miniupnpc")
+    (version "1.9")
+    (source 
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://miniupnp.tuxfamily.org/files/download.php?file=miniupnpc-"
+             version ".tar.gz"))
+       (sha256 
+        (base32 "0r24jdqcyf839n30ppimdna0hvybscyziaad7ng99fw0x19y88r9"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("python" ,python-2)))
+    (arguments
+     ;; The build system does not use a configure script but depends on
+     ;; `make'.  Hence we should pass parameters to `make' instead and remove
+     ;; the configure phase.
+     '(#:make-flags 
+       (list
+        (string-append
+         "SH=" (assoc-ref %build-inputs "bash") "/bin/sh")
+        (string-append "INSTALLPREFIX=" (assoc-ref %outputs "out"))
+        "CC=gcc")
+       #:phases
+       (alist-delete 
+          'configure
+          %standard-phases)))
+    (home-page "http://miniupnp.free.fr/")
+    (synopsis "Library implementing the client side UPnP protocol")
+    (description
+     "MiniUPnPc is a library is useful whenever an application needs to listen
+for incoming connections but is run behind a UPnP enabled router or firewall.
+Examples for such applications include: P2P applications, FTP clients for
+active mode, IRC (for DCC) or IM applications, network games, any server
+software.")
+    (license 
+     (x11-style
+      "https://github.com/miniupnp/miniupnp/blob/master/miniupnpc/LICENSE"))))
-- 
1.8.5.3

Re: [PATCH] gnu: Add miniupnpc.

[Andreas Enge]

Hello,

your message headers contain:
  Content-Type: text/plain; charset=y
so that "git am" complains about
  fatal: cannot convert from y to UTF-8
Or does the list software mess it up?

On Sat, Feb 22, 2014 at 10:37:05AM +0100, Sree Harsha Totakura wrote:
> +       #:phases
> +       (alist-delete 
> +          'configure
> +          %standard-phases)))

There is a tiny problem with indentation here.

> +    (license 
> +     (x11-style
> +      "https://github.com/miniupnp/miniupnp/blob/master/miniupnpc/LICENSE"))))

Can you refer to a file in the tarball and add the obigatory comment?
Something like:
    (license (x11-style "file://doc/README"
                        "See 'doc/README' in the distribution."))))
(copy-pasted from w3m).

Thanks,

Andreas

Re: [PATCH] gnu: Add miniupnpc.

[Sree Harsha Totakura]

On 02/23/2014 10:43 AM, Andreas Enge wrote:
> your message headers contain:
>   Content-Type: text/plain; charset=y
> so that "git am" complains about
>   fatal: cannot convert from y to UTF-8
> Or does the list software mess it up?

Ah, I think I answered with a 'y' when git complained that it is going
to send the message as UTF-8.  I guess I didn't read the message
properly; I guess it had asked me that character encoding the patch is in.

> 
> On Sat, Feb 22, 2014 at 10:37:05AM +0100, Sree Harsha Totakura wrote:
>> > +       #:phases
>> > +       (alist-delete 
>> > +          'configure
>> > +          %standard-phases)))
> There is a tiny problem with indentation here.
> 
>> > +    (license 
>> > +     (x11-style
>> > +      "https://github.com/miniupnp/miniupnp/blob/master/miniupnpc/LICENSE"))))
> Can you refer to a file in the tarball and add the obigatory comment?
> Something like:
>     (license (x11-style "file://doc/README"
>                         "See 'doc/README' in the distribution."))))
> (copy-pasted from w3m).

I fixed these in the following patch.

Sree

[PATCH] gnu: Add miniupnpc.

[Sree Harsha Totakura]

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

diff --git a/gnu-system.am b/gnu-system.am
index d231cfa..a521e42 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -203,6 +203,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/tor.scm				\
   gnu/packages/uucp.scm				\
   gnu/packages/unrtf.scm			\
+  gnu/packages/upnp.scm				\
   gnu/packages/valgrind.scm			\
   gnu/packages/version-control.scm		\
   gnu/packages/video.scm			\
diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm
new file mode 100644
index 0000000..72d63ee
--- /dev/null
+++ b/gnu/packages/upnp.scm
@@ -0,0 +1,63 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
+;;;
+;;; 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 upnp)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages python)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix download)
+  #:use-module (guix licenses)
+  #:use-module (guix packages))
+
+(define-public miniupnpc
+  (package
+    (name "miniupnpc")
+    (version "1.9")
+    (source 
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://miniupnp.tuxfamily.org/files/download.php?file=miniupnpc-"
+             version ".tar.gz"))
+       (sha256 
+        (base32 "0r24jdqcyf839n30ppimdna0hvybscyziaad7ng99fw0x19y88r9"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("python" ,python-2)))
+    (arguments
+     ;; The build system does not use a configure script but depends on
+     ;; `make'.  Hence we should pass parameters to `make' instead and remove
+     ;; the configure phase.
+     '(#:make-flags 
+       (list
+        (string-append
+         "SH=" (assoc-ref %build-inputs "bash") "/bin/sh")
+        (string-append "INSTALLPREFIX=" (assoc-ref %outputs "out"))
+        "CC=gcc")
+       #:phases
+       (alist-delete 'configure %standard-phases)))
+    (home-page "http://miniupnp.free.fr/")
+    (synopsis "Library implementing the client side UPnP protocol")
+    (description
+     "MiniUPnPc is a library is useful whenever an application needs to listen
+for incoming connections but is run behind a UPnP enabled router or firewall.
+Examples for such applications include: P2P applications, FTP clients for
+active mode, IRC (for DCC) or IM applications, network games, any server
+software.")
+    (license 
+     (x11-style "file://LICENSE" "See 'LICENSE' file in the distribution"))))
-- 
1.8.5.3

Re: [PATCH] gnu: Add miniupnpc.

[Andreas Enge]

On Mon, Feb 24, 2014 at 06:49:15PM +0100, Sree Harsha Totakura wrote:
> Ah, I think I answered with a 'y' when git complained that it is going
> to send the message as UTF-8.  I guess I didn't read the message
> properly; I guess it had asked me that character encoding the patch is in.

;-)

> I fixed these in the following patch.

Thanks! There was a bit of white space at line endings that I removed.

Your source url
    "http://miniupnp.tuxfamily.org/files/download.php?file=miniupnpc-"
    version ".tar.gz"))
resulted in something like
The following derivations would be built:
   /nix/store/8d3ih5jb6s9lpldsninz6iy0pq6ph4k9-miniupnpc-1.9.drv
   /nix/store/rgaz10pi27qwp4fwflfp9ajypsppwkx7-download.php?file=miniupnpc-1.9.tar.gz.drv

Rather ugly, although I suppose it works. I just guessed the file location
and dropped "download.php?file=", and it works like this.

I will push it now.

Andreas

Re: [PATCH] gnu: Add miniupnpc.

[Sree Harsha Totakura]

On 02/24/2014 10:15 PM, Andreas Enge wrote:
> The following derivations would be built:
>    /nix/store/8d3ih5jb6s9lpldsninz6iy0pq6ph4k9-miniupnpc-1.9.drv
>    /nix/store/rgaz10pi27qwp4fwflfp9ajypsppwkx7-download.php?file=miniupnpc-1.9.tar.gz.drv
> 
> Rather ugly, although I suppose it works. I just guessed the file location
> and dropped "download.php?file=", and it works like this.

Oh, I didn't see that.  Indeed, it is rather ugly, but thanks to your
quick fix :-)

Sree