From 4cff124bbf13bbfefdf7a5844f171b282ac0d9b0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 9 Mar 2016 15:20:34 +0100 Subject: gnu: openssl: Update to 1.0.2g. * gnu/packages/tls.scm (openssl)[replacement]: Remove. [version, source]: Bump to 1.0.2g. Use "openssl-c-rehash-in.patch" instead of "openssl-c-rehash.patch". (openssl-1.0.2g): Remove. * gnu-system.am (dist_patch_DATA): Remove "openssl-c-rehash.patch". --- gnu-system.am | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 4566ecac7d..dc1d038b96 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -636,7 +636,6 @@ dist_patch_DATA = \ gnu/packages/patches/openjpeg-CVE-2015-6581.patch \ gnu/packages/patches/openjpeg-use-after-free-fix.patch \ gnu/packages/patches/openssl-runpath.patch \ - gnu/packages/patches/openssl-c-rehash.patch \ gnu/packages/patches/openssl-c-rehash-in.patch \ gnu/packages/patches/orpheus-cast-errors-and-includes.patch \ gnu/packages/patches/ots-no-include-missing-file.patch \ -- cgit 1.4.1 From 58cc369f32d0b83d845fcf3cb2bdb5a8abdd2bb3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 21 Mar 2016 18:53:39 -0400 Subject: gnu: webkitgtk-2.4: Update to 2.4.10 [fixes many security flaws]. Fixes CVE-2014-1748, CVE-2015-1071, CVE-2015-1076, CVE-2015-1081, CVE-2015-1083, CVE-2015-1120, CVE-2015-1122, CVE-2015-1127, CVE-2015-1153, CVE-2015-1155, CVE-2015-3658, CVE-2015-3659, CVE-2015-3727, CVE-2015-3731, CVE-2015-3741, CVE-2015-3743, CVE-2015-3745, CVE-2015-3747, CVE-2015-3748, CVE-2015-3749, CVE-2015-3752, CVE-2015-5788, CVE-2015-5794, CVE-2015-5801, CVE-2015-5809, CVE-2015-5822, and CVE-2015-5928. * gnu/packages/patches/webkitgtk-2.4-sql-init-string.patch: Delete file. * gnu-system.am (dist_patch_DATA): Remove it. * gnu/packages/webkit.scm (webkitgtk-2.4): Update to 2.4.10. [source]: Remove patch. --- gnu-system.am | 1 - .../patches/webkitgtk-2.4-sql-init-string.patch | 17 ----------------- gnu/packages/webkit.scm | 6 ++---- 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 gnu/packages/patches/webkitgtk-2.4-sql-init-string.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index c819b5ab97..6cdc1e3345 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -776,7 +776,6 @@ dist_patch_DATA = \ gnu/packages/patches/w3m-force-ssl_verify_server-on.patch \ gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch \ gnu/packages/patches/w3m-disable-weak-ciphers.patch \ - gnu/packages/patches/webkitgtk-2.4-sql-init-string.patch \ gnu/packages/patches/weechat-python.patch \ gnu/packages/patches/weex-vacopy.patch \ gnu/packages/patches/wicd-bitrate-none-fix.patch \ diff --git a/gnu/packages/patches/webkitgtk-2.4-sql-init-string.patch b/gnu/packages/patches/webkitgtk-2.4-sql-init-string.patch deleted file mode 100644 index 671b5fb910..0000000000 --- a/gnu/packages/patches/webkitgtk-2.4-sql-init-string.patch +++ /dev/null @@ -1,17 +0,0 @@ -Copied from Fedora. - -https://bugzilla.redhat.com/show_bug.cgi?id=1189303 -http://pkgs.fedoraproject.org/cgit/webkitgtk.git/commit/?id=e689e45d0cc2c50484e69d20371ba607af7326f3 - -diff -up webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp.sql_initialize_string webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp ---- webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp.sql_initialize_string 2015-09-14 09:25:43.004200172 +0200 -+++ webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp 2015-09-14 09:25:57.852082368 +0200 -@@ -71,7 +71,7 @@ int SQLiteStatement::prepare() - // this lets SQLite avoid an extra string copy. - size_t lengthIncludingNullCharacter = query.length() + 1; - -- const char* tail; -+ const char* tail = nullptr; - int error = sqlite3_prepare_v2(m_database.sqlite3Handle(), query.data(), lengthIncludingNullCharacter, &m_statement, &tail); - - if (error != SQLITE_OK) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 3f2d11e70c..a57c11b98b 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -136,16 +136,14 @@ HTML/CSS applications to full-fledged web browsers.") (define-public webkitgtk-2.4 (package (inherit webkitgtk) (name "webkitgtk") - (version "2.4.9") + (version "2.4.10") (source (origin (method url-fetch) (uri (string-append "http://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "0r651ar3p0f8zwl7764kyimxk5hy88cwy116pv8cl5l8hbkjkpxg")) - (patches - (list (search-patch "webkitgtk-2.4-sql-init-string.patch"))))) + "0566yx5lxi40g0wpvmwbc8y76akd7zph7flrjdp2vv3z1nra9z9k")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests -- cgit 1.4.1 From ec0730cb6705d674cc6c52819c81ffb32f693ab8 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 23 Mar 2016 22:18:46 +0100 Subject: gnu: Add gnu-standards. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnu-doc.scm: New file. * gnu-system.am: Add it. Signed-off-by: Ludovic Courtès --- gnu-system.am | 1 + gnu/packages/gnu-doc.scm | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 gnu/packages/gnu-doc.scm (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 6cdc1e3345..8161632751 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -134,6 +134,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/gl.scm \ gnu/packages/glib.scm \ gnu/packages/gnome.scm \ + gnu/packages/gnu-doc.scm \ gnu/packages/gnucash.scm \ gnu/packages/gnunet.scm \ gnu/packages/gnupg.scm \ diff --git a/gnu/packages/gnu-doc.scm b/gnu/packages/gnu-doc.scm new file mode 100644 index 0000000000..572647d024 --- /dev/null +++ b/gnu/packages/gnu-doc.scm @@ -0,0 +1,74 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 Jan Nieuwenhuizen +;;; +;;; 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 . + +(define-module (gnu packages gnu-doc) + #:use-module (gnu packages base) + #:use-module (gnu packages compression) + #:use-module (gnu packages texinfo) + + #:use-module (guix build-system trivial) + #:use-module (guix cvs-download) + #:use-module (guix licenses) + #:use-module (guix packages)) + +(define-public gnu-standards + (package + (name "gnu-standards") + (version "2016-03-25") + (source + (origin + (method cvs-fetch) + (uri (cvs-reference + (root-directory + ":pserver:anonymous@cvs.savannah.gnu.org:/sources/gnustandards") + (module "gnustandards") + (revision "2016-03-25"))) + (sha256 + (base32 + "0qn7mzdjqwc6h9prin22x6kj9iqipxpbzldzhmis7q4x4hpi61vj")))) + (build-system trivial-build-system) + (native-inputs `(("gzip" ,gzip) + ("source" ,source) + ("texinfo" ,texinfo))) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((gzip (assoc-ref %build-inputs "gzip")) + (source (assoc-ref %build-inputs "source")) + (texinfo (assoc-ref %build-inputs "texinfo")) + (info-dir (string-append %output "/share/info"))) + (setenv "PATH" (string-append gzip "/bin" + ":" texinfo "/bin")) + (mkdir-p info-dir) + (system* "makeinfo" "--output" info-dir + (string-append source "/maintain.texi")) + (system* "makeinfo" "--output" info-dir + (string-append source "/standards.texi")) + (system* "gzip" (string-append info-dir "/maintain.info")) + (system* "gzip" (string-append info-dir "/standards.info")))))) + (home-page "http://www.gnu.org/prep/standards/") + (synopsis "GNU coding standards and maintainer information") + (description "The GNU Coding Standards were written by Richard Stallman +and other GNU Project volunteers. Their purpose is to make the GNU system +clean, consistent, and easy to install. + +The information for maintainers of GNU software has guidelines and advice for +someone who is the maintainer of a GNU program on behalf of the GNU Project.") + (license fdl1.3+))) -- cgit 1.4.1 From 2cdeecbe4da32b4ec8c23c338f11cd16d6eededa Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 26 Mar 2016 13:56:14 +0100 Subject: gnu: move miscfiles into gnu-doc.scm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/miscfiles.scm: Remove file. * gnu-sytem.am: Remove it. * gnu/packages/gnu-doc.scm (miscfiles): Move here. Signed-off-by: Ludovic Courtès --- gnu-system.am | 1 - gnu/packages/gnu-doc.scm | 27 ++++++++++++++++++++++++++ gnu/packages/miscfiles.scm | 47 ---------------------------------------------- 3 files changed, 27 insertions(+), 48 deletions(-) delete mode 100644 gnu/packages/miscfiles.scm (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 8161632751..3e81f73196 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -223,7 +223,6 @@ GNU_SYSTEM_MODULES = \ gnu/packages/mcrypt.scm \ gnu/packages/messaging.scm \ gnu/packages/mg.scm \ - gnu/packages/miscfiles.scm \ gnu/packages/mit-krb5.scm \ gnu/packages/moe.scm \ gnu/packages/moreutils.scm \ diff --git a/gnu/packages/gnu-doc.scm b/gnu/packages/gnu-doc.scm index 572647d024..3daa54ff12 100644 --- a/gnu/packages/gnu-doc.scm +++ b/gnu/packages/gnu-doc.scm @@ -1,4 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014 John Darrington ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. @@ -21,11 +22,37 @@ #:use-module (gnu packages compression) #:use-module (gnu packages texinfo) + #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix cvs-download) + #:use-module (guix download) #:use-module (guix licenses) #:use-module (guix packages)) +(define-public miscfiles + (package + (name "miscfiles") + (version "1.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/" name "/" name "-" + version ".tar.gz")) + (sha256 + (base32 + "005588vfrwx8ghsdv9p7zczj9lbc9a3r4m5aphcaqv8gif4siaka")))) + (build-system gnu-build-system) + (home-page "https://www.gnu.org/software/miscfiles/") + (synopsis + "Data files for airport codes, zip codes, a dictionary, and more") + (description + "GNU Miscfiles is a collection of common data files. They include, for +example, country abbreviations, names and capital cities; currency +abbreviations and names; a Best Current Practices index; a map of the ASCII +character set; a list of three-letter airport codes; and an English word +list.") + (license gpl2+))) + (define-public gnu-standards (package (name "gnu-standards") diff --git a/gnu/packages/miscfiles.scm b/gnu/packages/miscfiles.scm deleted file mode 100644 index fd0fc7b8e2..0000000000 --- a/gnu/packages/miscfiles.scm +++ /dev/null @@ -1,47 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright 2014 John Darrington -;;; -;;; 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 . - -(define-module (gnu packages miscfiles) - #:use-module (guix licenses) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu)) - -(define-public miscfiles - (package - (name "miscfiles") - (version "1.5") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/" name "/" name "-" - version ".tar.gz")) - (sha256 - (base32 - "005588vfrwx8ghsdv9p7zczj9lbc9a3r4m5aphcaqv8gif4siaka")))) - (build-system gnu-build-system) - (home-page "https://www.gnu.org/software/miscfiles/") - (synopsis - "Data files for airport codes, zip codes, a dictionary, and more") - (description - "GNU Miscfiles is a collection of common data files. They include, for -example, country abbreviations, names and capital cities; currency -abbreviations and names; a Best Current Practices index; a map of the ASCII -character set; a list of three-letter airport codes; and an English word -list.") - (license gpl2+))) -- cgit 1.4.1 From f5480572d0e1c8dffce72a6e393cae937d6b2d3d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 1 Apr 2016 09:48:11 +0200 Subject: gnu: wicd: Update to 1.7.4. * gnu/packages/wicd.scm (wicd): Update to 1.7.4. [source]: Remove 'wicd-template-instantiation.patch'. * gnu/packages/patches/wicd-template-instantiation.patch: Remove. * gnu-system.am (dist_patch_DATA): Remove it. --- gnu-system.am | 1 - .../patches/wicd-template-instantiation.patch | 29 ---------------------- gnu/packages/wicd.scm | 7 +++--- 3 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 gnu/packages/patches/wicd-template-instantiation.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 3e81f73196..1e730d96da 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -780,7 +780,6 @@ dist_patch_DATA = \ gnu/packages/patches/weex-vacopy.patch \ gnu/packages/patches/wicd-bitrate-none-fix.patch \ gnu/packages/patches/wicd-get-selected-profile-fix.patch \ - gnu/packages/patches/wicd-template-instantiation.patch \ gnu/packages/patches/wicd-urwid-1.3.patch \ gnu/packages/patches/wmctrl-64-fix.patch \ gnu/packages/patches/wpa-supplicant-CVE-2015-5310.patch \ diff --git a/gnu/packages/patches/wicd-template-instantiation.patch b/gnu/packages/patches/wicd-template-instantiation.patch deleted file mode 100644 index 16d8fa6e1d..0000000000 --- a/gnu/packages/patches/wicd-template-instantiation.patch +++ /dev/null @@ -1,29 +0,0 @@ -Wicd 1.7.3 fails to instantiate template lines that have several -variable references. For instance, the line: - - wep_key$_KEY_INDEX=$_KEY - -which is found in in the 'wep-hex' template, expands to these two -lines: - - wep_key0=$_KEY - wep_key0=123456789ab - -This patch fixes that by only emitting the fully substituted line. - -Patch by Ludovic Courtès . - ---- a/wicd/misc.py 2012-11-17 00:07:08 +0000 -+++ b/wicd/misc.py 2015-05-09 11:22:37 +0000 -@@ -321,11 +321,11 @@ def ParseEncryption(network): - rep_val = '0' - if rep_val: - line = line.replace("$_%s" % cur_val, str(rep_val)) -- config_file = ''.join([config_file, line]) - else: - print "Ignoring template line: '%s'" % line - else: - print "Weird parsing error occurred" -+ config_file = ''.join([config_file, line]) - else: # Just a regular entry. - config_file = ''.join([config_file, line]) diff --git a/gnu/packages/wicd.scm b/gnu/packages/wicd.scm index cad078e061..ad3aa58cdb 100644 --- a/gnu/packages/wicd.scm +++ b/gnu/packages/wicd.scm @@ -36,7 +36,7 @@ (define-public wicd (package (name "wicd") - (version "1.7.3") + (version "1.7.4") (source (origin (method url-fetch) @@ -44,12 +44,11 @@ (version-major+minor version) "/" version "/+download/wicd-" version ".tar.gz")) (sha256 - (base32 "00c4rq753bhg64rv1v9yl834ssq7igyy7cz3swp287b5n5bqiqwi")) + (base32 "0qpbwwsrqdp40mm3a8djpn2d055rxxspdhwijwsdnws700a9d637")) (patches (map search-patch '("wicd-bitrate-none-fix.patch" "wicd-get-selected-profile-fix.patch" - "wicd-urwid-1.3.patch" - "wicd-template-instantiation.patch"))))) + "wicd-urwid-1.3.patch"))))) (build-system python-build-system) (native-inputs `(("gettext" ,gnu-gettext))) (inputs `(("dbus-glib" ,dbus-glib) -- cgit 1.4.1 From 915363a3e2ebd264c329756661779a22247bcc42 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 1 Apr 2016 10:13:13 +0200 Subject: gnu: wicd: Add template for WPA2-TTLS. * gnu/packages/patches/wicd-wpa2-ttls.patch: New file. * gnu/packages/wicd.scm (wicd)[source]: Add it. * gnu-system.am (dist_patch_DATA): Add it. --- gnu-system.am | 1 + gnu/packages/patches/wicd-wpa2-ttls.patch | 38 +++++++++++++++++++++++++++++++ gnu/packages/wicd.scm | 4 +++- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/wicd-wpa2-ttls.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 1e730d96da..d45b3d1f0f 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -781,6 +781,7 @@ dist_patch_DATA = \ gnu/packages/patches/wicd-bitrate-none-fix.patch \ gnu/packages/patches/wicd-get-selected-profile-fix.patch \ gnu/packages/patches/wicd-urwid-1.3.patch \ + gnu/packages/patches/wicd-wpa2-ttls.patch \ gnu/packages/patches/wmctrl-64-fix.patch \ gnu/packages/patches/wpa-supplicant-CVE-2015-5310.patch \ gnu/packages/patches/wpa-supplicant-CVE-2015-5314.patch \ diff --git a/gnu/packages/patches/wicd-wpa2-ttls.patch b/gnu/packages/patches/wicd-wpa2-ttls.patch new file mode 100644 index 0000000000..9d80ee7ed2 --- /dev/null +++ b/gnu/packages/patches/wicd-wpa2-ttls.patch @@ -0,0 +1,38 @@ +Add a template for WPA2-TTLS, which is notably used by Eduroam. + +--- a/encryption/templates/active ++++ b/encryption/templates/active +@@ -4,6 +4,7 @@ wpa-psk + wpa-psk-hex + wpa2-leap + wpa2-peap ++wpa2-ttls + wep-hex + wep-passphrase + wep-shared +diff --git a/encryption/templates/wpa2-ttls b/encryption/templates/wpa2-ttls +new file mode 100644 +index 0000000..4f66a1e +--- /dev/null ++++ b/encryption/templates/wpa2-ttls +@@ -0,0 +1,20 @@ ++name = WPA2-TTLS (used notably by Eduroam) ++author = various contributors ++version = 1 ++require identity *Identity anonymous_identity *Anonymous_identity password *Password ca_cert *Path_to_CA_Cert ++protected password *Password ++----- ++ctrl_interface=/var/run/wpa_supplicant ++network={ ++ ssid="$_ESSID" ++ scan_ssid=$_SCAN ++ proto=WPA2 ++ key_mgmt=WPA-EAP ++ group=CCMP TKIP ++ eap=TTLS ++ identity="$_IDENTITY" ++ password="$_PASSWORD" ++ anonymous_identity="$_ANONYMOUS_IDENTITY" ++ ca_cert="$_CA_CERT" ++ phase2="auth=PAP" ++} diff --git a/gnu/packages/wicd.scm b/gnu/packages/wicd.scm index ad3aa58cdb..350baf7373 100644 --- a/gnu/packages/wicd.scm +++ b/gnu/packages/wicd.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015 Pierre-Antoine Rault ;;; Copyright © 2015 Andreas Enge +;;; Copyright © 2016 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,7 +49,8 @@ (patches (map search-patch '("wicd-bitrate-none-fix.patch" "wicd-get-selected-profile-fix.patch" - "wicd-urwid-1.3.patch"))))) + "wicd-urwid-1.3.patch" + "wicd-wpa2-ttls.patch"))))) (build-system python-build-system) (native-inputs `(("gettext" ,gnu-gettext))) (inputs `(("dbus-glib" ,dbus-glib) -- cgit 1.4.1 From 451c1436a38a92d6903f78381f74c935a332ee87 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 2 Apr 2016 23:39:32 +0300 Subject: gnu: mc: Update to 4.8.16. * gnu/packages/mc.scm (mc): Update to 4.8.16. [source]: Remove patch. * gnu/packages/patches/mc-fix-ncurses-build.patch: Remove. * gnu-system.am (dist_patch_DATA): Remove it. --- gnu-system.am | 1 - gnu/packages/mc.scm | 8 +++--- gnu/packages/patches/mc-fix-ncurses-build.patch | 37 ------------------------- 3 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 gnu/packages/patches/mc-fix-ncurses-build.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index d45b3d1f0f..d883cdc207 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -623,7 +623,6 @@ dist_patch_DATA = \ gnu/packages/patches/mars-sfml-2.3.patch \ gnu/packages/patches/matplotlib-setupext-tk.patch \ gnu/packages/patches/maxima-defsystem-mkdir.patch \ - gnu/packages/patches/mc-fix-ncurses-build.patch \ gnu/packages/patches/mcron-install.patch \ gnu/packages/patches/mdadm-gcc-4.9-fix.patch \ gnu/packages/patches/mhash-keygen-test-segfault.patch \ diff --git a/gnu/packages/mc.scm b/gnu/packages/mc.scm index 6e3747c943..43dab8ff41 100644 --- a/gnu/packages/mc.scm +++ b/gnu/packages/mc.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Eric Bavier +;;; Copyright © 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,7 +34,7 @@ (define-public mc (package (name "mc") - (version "4.8.11") + (version "4.8.16") (source (origin (method url-fetch) @@ -41,8 +42,7 @@ version ".tar.xz")) (sha256 (base32 - "0flrw5pq2mg2d39bh6dllndhpcfppjza6g70p4ry2wcx9y2flxqq")) - (patches (list (search-patch "mc-fix-ncurses-build.patch"))))) + "083h5gwc0nny9b557way5dsmj71g2bzkiai4bn30y5nkjwqbxg5v")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("perl" ,perl))) @@ -63,4 +63,4 @@ copying and moving, Midnight Commander also supports viewing the contents of RPM package files and other archives and managing files on other computers via FTP or FISH. It also includes a powerful text editor for opening text files.") - (license gpl2))) + (license gpl3+))) diff --git a/gnu/packages/patches/mc-fix-ncurses-build.patch b/gnu/packages/patches/mc-fix-ncurses-build.patch deleted file mode 100644 index c583c92e10..0000000000 --- a/gnu/packages/patches/mc-fix-ncurses-build.patch +++ /dev/null @@ -1,37 +0,0 @@ -Patch cherry-picked from resolution of -http://www.midnight-commander.org/ticket/3114 - ---- a/lib/tty/key.c (revision 0ed4a91d7df4e50512defd2e0734ecab7c9da07f) -+++ b/lib/tty/key.c (revision d870aedad1907773f8586fe818a89e6b5178b849) -@@ -1947,4 +1947,5 @@ - { - int c; -+ int flag = 0; /* Return value from select */ - #ifdef HAVE_LIBGPM - static struct Gpm_Event ev; /* Mouse event */ -@@ -1979,5 +1980,4 @@ - { - int nfd; -- static int flag = 0; /* Return value from select */ - fd_set select_set; - ---- a/lib/tty/tty-ncurses.c (revision bb65b467900ea9eb1f7867c059fd26fac86c747c) -+++ b/lib/tty/tty-ncurses.c (revision d870aedad1907773f8586fe818a89e6b5178b849) -@@ -50,4 +50,5 @@ - #include "tty.h" - #include "color-internal.h" -+#include "key.h" - #include "mouse.h" - #include "win.h" -@@ -531,4 +532,5 @@ - { - int res; -+ unsigned char str[UTF8_CHAR_LEN + 1]; - - res = g_unichar_to_utf8 (c, (char *) str); -@@ -541,5 +543,4 @@ - else - { -- unsigned char str[UTF8_CHAR_LEN + 1]; - const char *s; - -- cgit 1.4.1 From fd7fd3c1678a63eb22995fef1d1eed09ff57efe6 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 4 Apr 2016 22:52:51 -0400 Subject: gnu: libextractor: Add patch to fix build with ffmpeg-3. * gnu/packages/patches/libextractor-ffmpeg-3.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/gnunet.scm (libextractor)[source]: Add patch. --- gnu-system.am | 1 + gnu/packages/gnunet.scm | 2 + gnu/packages/patches/libextractor-ffmpeg-3.patch | 147 +++++++++++++++++++++++ 3 files changed, 150 insertions(+) create mode 100644 gnu/packages/patches/libextractor-ffmpeg-3.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index d883cdc207..c8048b7750 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -580,6 +580,7 @@ dist_patch_DATA = \ gnu/packages/patches/libcmis-fix-test-onedrive.patch \ gnu/packages/patches/libdrm-symbol-check.patch \ gnu/packages/patches/libevent-dns-tests.patch \ + gnu/packages/patches/libextractor-ffmpeg-3.patch \ gnu/packages/patches/libmtp-devices.patch \ gnu/packages/patches/liboop-mips64-deplibs-fix.patch \ gnu/packages/patches/libotr-test-auth-fix.patch \ diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index eb0c4cbe83..471f383b85 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2015 Efraim Flashner ;;; Copyright © 2016 Ni* Gillmann ;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2016 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,6 +67,7 @@ (sha256 (base32 "0zvv7wd011npcx7yphw9bpgivyxz6mlp87a57n96nv85k96dd2l6")) + (patches (list (search-patch "libextractor-ffmpeg-3.patch"))) (modules '((guix build utils))) (snippet ;; Nowadays libmagic (from 'file') returns 'audio/ogg' and not diff --git a/gnu/packages/patches/libextractor-ffmpeg-3.patch b/gnu/packages/patches/libextractor-ffmpeg-3.patch new file mode 100644 index 0000000000..7688bdc37f --- /dev/null +++ b/gnu/packages/patches/libextractor-ffmpeg-3.patch @@ -0,0 +1,147 @@ +Fix build for ffmpeg-3.0. +Based on a patch by Andreas Cadhalpun +for ffmpeg-2.9, found at +and later modified by Mark H Weaver for ffmpeg-3.0. + +--- libextractor-1.3/src/plugins/thumbnailffmpeg_extractor.c.orig 2013-12-21 11:04:41.000000000 -0500 ++++ libextractor-1.3/src/plugins/thumbnailffmpeg_extractor.c 2016-04-04 22:42:17.859001669 -0400 +@@ -153,7 +153,7 @@ + static size_t + create_thumbnail (int src_width, int src_height, + int src_stride[], +- enum PixelFormat src_pixfmt, ++ enum AVPixelFormat src_pixfmt, + const uint8_t * const src_data[], + int dst_width, int dst_height, + uint8_t **output_data, +@@ -189,7 +189,7 @@ + if (NULL == + (scaler_ctx = + sws_getContext (src_width, src_height, src_pixfmt, +- dst_width, dst_height, PIX_FMT_RGB24, ++ dst_width, dst_height, AV_PIX_FMT_RGB24, + SWS_BILINEAR, NULL, NULL, NULL))) + { + #if DEBUG +@@ -199,7 +199,7 @@ + return 0; + } + +- if (NULL == (dst_frame = avcodec_alloc_frame ())) ++ if (NULL == (dst_frame = av_frame_alloc ())) + { + #if DEBUG + fprintf (stderr, +@@ -209,7 +209,7 @@ + return 0; + } + if (NULL == (dst_buffer = +- av_malloc (avpicture_get_size (PIX_FMT_RGB24, dst_width, dst_height)))) ++ av_malloc (avpicture_get_size (AV_PIX_FMT_RGB24, dst_width, dst_height)))) + { + #if DEBUG + fprintf (stderr, +@@ -220,7 +220,7 @@ + return 0; + } + avpicture_fill ((AVPicture *) dst_frame, dst_buffer, +- PIX_FMT_RGB24, dst_width, dst_height); ++ AV_PIX_FMT_RGB24, dst_width, dst_height); + sws_scale (scaler_ctx, + src_data, + src_stride, +@@ -255,7 +255,7 @@ + } + encoder_codec_ctx->width = dst_width; + encoder_codec_ctx->height = dst_height; +- encoder_codec_ctx->pix_fmt = PIX_FMT_RGB24; ++ encoder_codec_ctx->pix_fmt = AV_PIX_FMT_RGB24; + opts = NULL; + if (avcodec_open2 (encoder_codec_ctx, encoder_codec, &opts) < 0) + { +@@ -410,7 +410,7 @@ + return; + } + av_dict_free (&opts); +- if (NULL == (frame = avcodec_alloc_frame ())) ++ if (NULL == (frame = av_frame_alloc ())) + { + #if DEBUG + fprintf (stderr, +@@ -563,7 +563,7 @@ + return; + } + +- if (NULL == (frame = avcodec_alloc_frame ())) ++ if (NULL == (frame = av_frame_alloc ())) + { + #if DEBUG + fprintf (stderr, +--- libextractor-1.3/src/plugins/previewopus_extractor.c.orig 2013-12-22 17:44:18.000000000 -0500 ++++ libextractor-1.3/src/plugins/previewopus_extractor.c 2016-04-04 22:49:05.168105265 -0400 +@@ -296,7 +296,7 @@ + /** Initialize one audio frame for reading from the input file */ + static int init_input_frame(AVFrame **frame) + { +- if (!(*frame = avcodec_alloc_frame())) { ++ if (!(*frame = av_frame_alloc())) { + #if DEBUG + fprintf(stderr, "Could not allocate input frame\n"); + #endif +@@ -655,7 +655,7 @@ + av_freep(&converted_input_samples[0]); + free(converted_input_samples); + } +- avcodec_free_frame(&input_frame); ++ av_frame_free(&input_frame); + + return ret; + } +@@ -671,7 +671,7 @@ + int error; + + /** Create a new frame to store the audio samples. */ +- if (!(*frame = avcodec_alloc_frame())) { ++ if (!(*frame = av_frame_alloc())) { + #if DEBUG + fprintf(stderr, "Could not allocate output frame\n"); + #endif +@@ -702,7 +702,7 @@ + #if DEBUG + fprintf(stderr, "Could allocate output frame samples (error '%s')\n", get_error_text(error)); + #endif +- avcodec_free_frame(frame); ++ av_frame_free(frame); + return error; + } + +@@ -783,17 +783,17 @@ + #if DEBUG + fprintf(stderr, "Could not read data from FIFO\n"); + #endif +- avcodec_free_frame(&output_frame); ++ av_frame_free(&output_frame); + return AVERROR_EXIT; + } + + /** Encode one frame worth of audio samples. */ + if (encode_audio_frame(output_frame, output_format_context, + output_codec_context, &data_written)) { +- avcodec_free_frame(&output_frame); ++ av_frame_free(&output_frame); + return AVERROR_EXIT; + } +- avcodec_free_frame(&output_frame); ++ av_frame_free(&output_frame); + return 0; + } + /** Write the trailer of the output file container. */ +@@ -907,7 +907,7 @@ + return; + } + +- if (NULL == (frame = avcodec_alloc_frame ())) ++ if (NULL == (frame = av_frame_alloc ())) + { + #if DEBUG + fprintf (stderr, -- cgit 1.4.1