From 652940d060fba5df8e058ff6073a270758d43448 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Aug 2018 17:56:09 +0200 Subject: gnu: ldb: Update to 1.3.6. * gnu/packages/samba.scm (ldb): Update to 1.3.6. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/samba.scm') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 16b9470e7c..3316e665f0 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -341,14 +341,14 @@ many event types, including timers, signals, and the classic file descriptor eve (define-public ldb (package (name "ldb") - (version "1.3.3") + (version "1.3.6") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/ldb/ldb-" version ".tar.gz")) (sha256 (base32 - "14gsrm7dvyjpbpnc60z75j6fz2p187abm2h353lq95kx2bv70c1b")) + "16lkz3gyvsm9als1wyimsl573hclr72xy6454mshwjanncs33lji")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From d3c1075c144c14d884290eb3012af946a5935ca1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Aug 2018 17:57:37 +0200 Subject: gnu: samba: Update to 4.8.5. * gnu/packages/samba.scm (samba): Update to 4.8.5. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/samba.scm') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 3316e665f0..345655d584 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -150,14 +150,14 @@ anywhere.") (define-public samba (package (name "samba") - (version "4.8.4") + (version "4.8.5") (source (origin (method url-fetch) (uri (string-append "https://download.samba.org/pub/samba/stable/" "samba-" version ".tar.gz")) (sha256 (base32 - "01jlk8xlawfp3yyhi5migcd1fy7dkavbh56in444m281kqa4s17m")))) + "0mailvhjsma19k6b6zjl02z9n2hbbyfybvicjfw2hh9d4sqyd3p5")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From cbd7c65709b1195de9196772c7f8ae6863797b35 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Sep 2018 15:35:23 +0200 Subject: gnu: ppp: Return #t from all phases. * gnu/packages/samba.scm (ppp)[arguments]: Return #t from phase. --- gnu/packages/samba.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/samba.scm') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 345655d584..a6d6ee30cd 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -417,7 +417,8 @@ key-value pair databases and a real LDAP database.") (("/usr/include/crypt\\.h") (string-append libc "/include/crypt.h")) (("/usr/include/pcap-bpf.h") - (string-append libpcap "/include/pcap-bpf.h"))))))))) + (string-append libpcap "/include/pcap-bpf.h"))) + #t)))))) (inputs `(("libpcap" ,libpcap))) (synopsis "Implementation of the Point-to-Point Protocol") -- cgit v1.2.3 From 65a58f390704878e8adc8712786333ebd79c6a64 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Sep 2018 15:42:42 +0200 Subject: gnu: ppp: Use OpenSSL for cryptography. * gnu/packages/samba.scm (ppp)[source](patches): Add upstream patch. [inputs]: Add OPENSSL. [arguments]: Add substitution for OpenSSL headers. --- gnu/packages/samba.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'gnu/packages/samba.scm') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index a6d6ee30cd..65d41a2b67 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -400,6 +400,18 @@ key-value pair databases and a real LDAP database.") (method url-fetch) (uri (string-append "https://www.samba.org/ftp/ppp/ppp-" version ".tar.gz")) + (patches + (list (origin + ;; Use OpenSSL for cryptography instead of the obsolete glibc + ;; crypto functions that were removed in glibc 2.28. + (method url-fetch) + (uri (string-append "https://github.com/paulusmack/ppp/commit/" + "3c7b86229f7bd2600d74db14b1fe5b3896be3875" + ".patch")) + (file-name "ppp-use-openssl-crypto.patch") + (sha256 + (base32 + "0qlbi247lx3injpy8a1gcij9yilik0vfaibkpvdp88k3sa1rs69z"))))) (sha256 (base32 "0c7vrjxl52pdwi4ckrvfjr08b31lfpgwf3pp0cqy76a77vfs7q02")))) @@ -412,15 +424,19 @@ key-value pair databases and a real LDAP database.") (add-before 'configure 'patch-Makefile (lambda* (#:key inputs #:allow-other-keys) (let ((libc (assoc-ref inputs "libc")) + (openssl (assoc-ref inputs "openssl")) (libpcap (assoc-ref inputs "libpcap"))) (substitute* "pppd/Makefile.linux" (("/usr/include/crypt\\.h") (string-append libc "/include/crypt.h")) + (("/usr/include/openssl") + (string-append openssl "/include/openssl")) (("/usr/include/pcap-bpf.h") (string-append libpcap "/include/pcap-bpf.h"))) #t)))))) (inputs - `(("libpcap" ,libpcap))) + `(("libpcap" ,libpcap) + ("openssl" ,(@ (gnu packages tls) openssl)))) (synopsis "Implementation of the Point-to-Point Protocol") (home-page "https://ppp.samba.org/") (description -- cgit v1.2.3 From f38eedd518816707cd407879f2f862095960b9fc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 22 Oct 2018 18:12:37 +0200 Subject: gnu: samba: Update to 4.8.6. * gnu/packages/samba.scm (samba): Update to 4.8.6. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/samba.scm') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index a6d6ee30cd..458ff50ae8 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -150,14 +150,14 @@ anywhere.") (define-public samba (package (name "samba") - (version "4.8.5") + (version "4.8.6") (source (origin (method url-fetch) (uri (string-append "https://download.samba.org/pub/samba/stable/" "samba-" version ".tar.gz")) (sha256 (base32 - "0mailvhjsma19k6b6zjl02z9n2hbbyfybvicjfw2hh9d4sqyd3p5")))) + "15hawqdm37l6lp9k14c634315p77cllsx89bvbw9h38fg1hj3fbk")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 2b61cd37b44400c881ec2dc20202f3505ef1d25b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 13:08:56 +0100 Subject: gnu: cifs-utils: Remove autoreconf phase. * gnu/packages/samba.scm (cifs-utils)[arguments]: Remove autoreconf phase. --- gnu/packages/samba.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu/packages/samba.scm') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 458ff50ae8..ff237c96ce 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -73,10 +74,6 @@ (arguments `(#:phases (modify-phases %standard-phases - ;; The 6.7 tarball is missing ‘install.sh’. Create it. - (add-after 'unpack 'autoreconf - (lambda _ - (invoke "autoreconf" "-i"))) (add-before 'configure 'set-root-sbin (lambda _ ; Don't try to install in "/sbin". (setenv "ROOTSBINDIR" -- cgit v1.2.3