From 9606041dcb8509a1d62c9c80261178330cf60615 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 28 Dec 2020 12:40:28 +0100 Subject: gnu: libupnp: Update to 1.14.0. * gnu/packages/upnp.scm (libupnp): Update to 1.14.0. Signed-off-by: Leo Famulari --- gnu/packages/upnp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/upnp.scm') diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index f0c03e12b3..aac2ae370f 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -94,7 +94,7 @@ (define-public miniupnpc (define-public libupnp (package (name "libupnp") - (version "1.12.1") + (version "1.14.0") (source (origin (method url-fetch) @@ -102,7 +102,7 @@ (define-public libupnp "/release-" version "/libupnp-" version".tar.bz2")) (sha256 (base32 - "02a0dnbk1cla8xlb5l2zp09grv2hsf8n4jbd560mmzj830mn8dpw")))) + "1sswsdqzarrd6h9mld2lncbcrfhd4p16zcafvmxqm34nj513vcpc")))) (native-inputs `(("pkg-config" ,pkg-config))) (build-system gnu-build-system) -- cgit v1.2.3 From 91bc4f4dfbefabca103390fb3916090f7f6ce80f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 6 Jan 2021 09:20:19 +0200 Subject: gnu: readymedia: Clean-up origin code. * gnu/packages/upnp.scm (readymedia)[source]: Replace custom logic with string-replace-substring. --- gnu/packages/upnp.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu/packages/upnp.scm') diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index aac2ae370f..9707639d24 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018 Theodoros Foradis ;;; Copyright © 2019 Jens Mølgaard ;;; Copyright © 2020 Jan Wielkiewicz +;;; Copyright © 2021 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -132,11 +133,7 @@ (define-public readymedia (uri (git-reference (url "https://git.code.sf.net/p/minidlna/git") (commit (string-append - "v" - (string-map (match-lambda - (#\. #\_) - (chr chr)) - version))))) + "v" (string-replace-substring version "." "_"))))) (file-name (git-file-name name version)) (sha256 (base32 -- cgit v1.2.3 From de194a39d3d49c7424d08e04b675ff649035e7b1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 6 Jan 2021 09:22:26 +0200 Subject: gnu: upnp.scm: Use license prefix. * gnu/packages/upnp.scm: Use the 'license:' prefix to denote licences. --- gnu/packages/upnp.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/upnp.scm') diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 9707639d24..fed5eb18ed 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -38,7 +38,7 @@ (define-module (gnu packages upnp) #:use-module (guix utils) #:use-module (guix download) #:use-module (guix git-download) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (ice-9 match)) @@ -90,7 +90,7 @@ (define-public miniupnpc include peer-to-peer applications, active-mode FTP clients, DCC file transfers over IRC, instant messaging, network games, and most server software.") (license - (x11-style "file://LICENSE" "See 'LICENSE' file in the distribution")))) + (license:x11-style "file://LICENSE" "See 'LICENSE' file in the distribution")))) (define-public libupnp (package @@ -121,7 +121,7 @@ (define-public libupnp compliant with Version 1.0 of the Universal Plug and Play Device Architecture Specification and support several operating systems like Linux, *BSD, Solaris and others.") - (license bsd-3))) + (license license:bsd-3))) (define-public readymedia (package @@ -156,4 +156,4 @@ (define-public readymedia (description "ReadyMedia (formerly known as MiniDLNA) is a simple media server, which serves multimedia content to compatible clients on the network. It aims to be fully compliant with DLNA and UPnP-AV standards.") - (license gpl2))) + (license license:gpl2))) -- cgit v1.2.3 From 406008a2ac8b03317623a9967ec2e5fd3dca7650 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 6 Jan 2021 09:34:29 +0200 Subject: gnu: readymedia: Update to 1.3.0. Fixes CVE-2020-28926. * gnu/packages/upnp.scm (readymedia): Update to 1.3.0. [arguments]: Add configure-flag to not record kernel version of build machine. Add phase to remove spurious substitution of ffmpeg libraries. [inputs]: Add zlib. --- gnu/packages/upnp.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'gnu/packages/upnp.scm') diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index fed5eb18ed..9106dd1beb 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -26,6 +26,7 @@ (define-module (gnu packages upnp) #:use-module (gnu packages) #:use-module (gnu packages gettext) #:use-module (gnu packages autotools) + #:use-module (gnu packages compression) #:use-module (gnu packages video) #:use-module (gnu packages photo) #:use-module (gnu packages image) @@ -126,7 +127,7 @@ (define-public libupnp (define-public readymedia (package (name "readymedia") - (version "1.2.1") + (version "1.3.0") (source (origin (method git-fetch) @@ -137,8 +138,17 @@ (define-public readymedia (file-name (git-file-name name version)) (sha256 (base32 - "160915yv38k0p5zmyncs12kkbbcd8m8fk9jq70fkfd5x6dz40xm4")))) + "0g04lffj37wdv5bnpl5faxpnmlj6bbk8y7ziaz2wp6h82g6kb5wj")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--with-os-name=Linux") ; uname -s + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* "Makefile.am" + ((".*LIBAVUTIL_LIBS.*") "")) + #t))))) (native-inputs `(("automake" ,automake) ("autoconf" ,autoconf) @@ -150,7 +160,8 @@ (define-public readymedia ("flac" ,flac) ("libvorbis" ,libvorbis) ("sqlite" ,sqlite) - ("ffmpeg" ,ffmpeg))) + ("ffmpeg" ,ffmpeg) + ("zlib" ,zlib))) (home-page "https://sourceforge.net/projects/minidlna/") (synopsis "DLNA/UPnP-AV media server") (description "ReadyMedia (formerly known as MiniDLNA) is a simple media -- cgit v1.2.3 From 7dfc2d2e7f7ff5b0e8210ed7710f3cc87841d29c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 6 Jan 2021 09:35:40 +0200 Subject: gnu: readymedia: Sort inputs alphabetically. * gnu/packages/upnp.scm (readymedia)[native-inputs]: Sort alphabetically. [inputs]: Same. --- gnu/packages/upnp.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/upnp.scm') diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 9106dd1beb..79739691e8 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -150,17 +150,17 @@ (define-public readymedia ((".*LIBAVUTIL_LIBS.*") "")) #t))))) (native-inputs - `(("automake" ,automake) - ("autoconf" ,autoconf) + `(("autoconf" ,autoconf) + ("automake" ,automake) ("gettext" ,gettext-minimal))) (inputs - `(("libexif" ,libexif) - ("libjpeg" ,libjpeg-turbo) - ("libid3tag" ,libid3tag) + `(("ffmpeg" ,ffmpeg) ("flac" ,flac) + ("libexif" ,libexif) + ("libid3tag" ,libid3tag) + ("libjpeg" ,libjpeg-turbo) ("libvorbis" ,libvorbis) ("sqlite" ,sqlite) - ("ffmpeg" ,ffmpeg) ("zlib" ,zlib))) (home-page "https://sourceforge.net/projects/minidlna/") (synopsis "DLNA/UPnP-AV media server") -- cgit v1.2.3 From 6200fcabcf3491554e7ea5a2091eb86dbc0cfda6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 6 Jan 2021 09:37:02 +0200 Subject: gnu: upnp.scm: Sort package module imports alphabetically. * gnu/packages/upnp.scm: Sort package module imports alphabetically. --- gnu/packages/upnp.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/upnp.scm') diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 79739691e8..8f4e9952f2 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -24,17 +24,17 @@ (define-module (gnu packages upnp) #:use-module (gnu packages) - #:use-module (gnu packages gettext) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) - #:use-module (gnu packages video) - #:use-module (gnu packages photo) + #:use-module (gnu packages gettext) #:use-module (gnu packages image) #:use-module (gnu packages mp3) + #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages xiph) - #:use-module (gnu packages sqlite) #:use-module (gnu packages python) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages video) + #:use-module (gnu packages xiph) #:use-module (guix build-system gnu) #:use-module (guix utils) #:use-module (guix download) -- cgit v1.2.3