From 2e701cd3841d4449b3963d4337c543be99ed7bcc Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 20 Jun 2017 03:38:35 -0400 Subject: gnu: linux-libre-arm-generic: Add mitigation for CVE-2017-1000364. This is a followup to commit 91c623aae0f10992aa46957b9072679534e4cd28. * gnu/packages/linux.scm (linux-libre-arm-generic): Add patch to mitigate CVE-2017-1000364. --- gnu/packages/linux.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3ec423422b..03cf8ed2a4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -420,7 +420,17 @@ https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/patch %linux-libre-hash '("armhf-linux") #:defconfig "multi_v7_defconfig" - #:extra-version "arm-generic")) + #:extra-version "arm-generic" + #:patches + (list %boot-logo-patch + (origin + (method url-fetch) + (uri "\ +https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/patch/?id=167ec8235f978d7af78c73e9490dae1af3fee67f") + (file-name "linux-libre-4.11-CVE-2017-1000364.patch") + (sha256 + (base32 + "0hv3lxjgpssvsldkydg5q7znnzxv5ncpzrk6g11q01k3gkl0q689")))))) ;;; -- cgit 1.4.1 From 3116c8b5e05d5fd120a2da1fbac51acafc13dfb0 Mon Sep 17 00:00:00 2001 From: nee Date: Sat, 10 Jun 2017 19:12:10 +0200 Subject: gnu: Add ddate. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (ddate): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/linux.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 03cf8ed2a4..9ba35a0a1e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 Rutger Helling +;;; Copyright © 2017 nee ;;; ;;; This file is part of GNU Guix. ;;; @@ -605,6 +606,27 @@ block devices, UUIDs, TTYs, and many other tools.") (license (list license:gpl3+ license:gpl2+ license:gpl2 license:lgpl2.0+ license:bsd-4 license:public-domain)))) +(define-public ddate + (package + (name "ddate") + (version "0.2.2") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/bo0ts/ddate/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1bbqqq8mswj4bp9083gxjaky5ysfznax4cynsqwmy125z053yg6m")))) + (build-system cmake-build-system) + (arguments '(#:tests? #f)) + (home-page "https://github.com/bo0ts/ddate") + (synopsis "PERPETUAL DATE CONVERTER FROM GREGORIAN TO POEE CALENDAR") + (description + "ddate displays the Discordian date and holidays of a given date. +The Discordian calendar was made popular by the \"Illuminatus!\" trilogy +by Robert Shea and Robert Anton Wilson.") + (license license:public-domain))) + (define-public procps (package (name "procps") -- cgit 1.4.1 From 6876a6fe53a63b986a1e061e07c4c378a9da95c9 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sun, 25 Jun 2017 22:40:36 +0800 Subject: gnu: Add ebtables. * gnu/packages/linux.scm (ebtables): New package. --- gnu/packages/linux.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9ba35a0a1e..e826520c5c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1093,6 +1093,61 @@ package also includes ip6tables. ip6tables is used for configuring the IPv6 packet filter.") (license license:gpl2+))) +(define-public ebtables + (package + (name "ebtables") + (version "2.0.10-4") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://netfilter.org/ebtables/ebtables-v" + version ".tar.gz")) + (sha256 + (base32 + "0pa5ljlk970yfyhpf3iqwfpbc30j8mgn90fapw9cfz909x47nvyw")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; no test suite + #:make-flags + (let* ((out (assoc-ref %outputs "out")) + (bin (string-append out "/sbin")) + (lib (string-append out "/lib")) + (man (string-append out "/share/man")) + (iptables (assoc-ref %build-inputs "iptables")) + (ethertypes (string-append iptables "/etc/ethertypes"))) + (list (string-append "LIBDIR=" lib) + (string-append "MANDIR=" man) + (string-append "BINDIR=" bin) + (string-append "ETHERTYPESFILE=" ethertypes) + ;; With the default CFLAGS, it falis with: + ;; communication.c:259:58: error: variable ‘ret’ set but not + ;; used [-Werror=unused-but-set-variable] + "CFLAGS=-Wall")) + #:phases + (modify-phases %standard-phases + (replace 'configure + ;; no configure script + (lambda _ + (substitute* "Makefile" + ;; Remove user and group options from install commands, + ;; otherwise it fails with: invalid user 'root'. + (("-o root -g root") "") + ;; Remove 'ethertypes' from the install target. + (("install: .*") + "install: $(MANDIR)/man8/ebtables.8 exec scripts\n")) + #t))))) + (inputs + `(("perl" ,perl) + ("iptables" ,iptables))) + (synopsis "Ethernet bridge frame table administration") + (home-page "http://ebtables.netfilter.org/") + (description + "ebtables is an application program used to set up and maintain the +tables of rules (inside the Linux kernel) that inspect Ethernet frames. It is +analogous to the iptables application, but less complicated, due to the fact +that the Ethernet protocol is much simpler than the IP protocol.") + (license license:gpl2+))) + (define-public iproute (package (name "iproute2") -- cgit 1.4.1 From afc9d8ec2b724b67f85b05011725bb636f209a1a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 23 Jun 2017 18:46:02 -0400 Subject: gnu: Add jmtpfs. * gnu/packages/linux.scm (jmtpfs): New variable. --- gnu/packages/linux.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e826520c5c..ec950d2272 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -63,6 +63,7 @@ #:use-module (gnu packages documentation) #:use-module (gnu packages elf) #:use-module (gnu packages flex) + #:use-module (gnu packages file) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) @@ -4152,3 +4153,30 @@ from the CPUID instruction, and also determines the exact model of CPU(s). It supports Intel, AMD, and VIA CPUs, as well as older Transmeta, Cyrix, UMC, NexGen, Rise, and SiS CPUs.") (license license:gpl2+))) + +(define-public jmtpfs + (package + (name "jmtpfs") + (version "0.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/JasonFerrara/jmtpfs/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "10v8d7mmx8b8123x5f9y9zaaa428ms6wkngwn2ra71n5a53wrjn0")))) + (build-system gnu-build-system) + (inputs + `(("file" ,file) + ("fuse" ,fuse) + ("libmtp" ,libmtp))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://github.com/JasonFerrara/jmtpfs") + (synopsis "Use a FUSE filesystem to access data over MTP") + (description "jmtpfs uses FUSE (filesystem in userspace) to provide access +to data over the Media Transfer Protocol (MTP). Unprivileged users can mount +the MTP device as a filesystem.") + (license license:gpl3))) -- cgit 1.4.1