ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 22:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: samba: Update to 4.13.1.

Browse source 
* gnu/packages/samba.scm (samba): Update to 4.13.1.
[native-inputs]: Add libxml2.
[phases]{locate-docbook-stylesheets}: Rename to...
{setup-docbook-stylesheets}: ...this.  Setup offline Samba DTD catalog, and
have it used along any pre-existing XML_CATALOG_FILES environment variable in
the build script.
This commit is contained in:
Maxim Cournoyer 2020-11-01 23:59:07 -05:00
parent 8a7bbc3547
commit 0c96afe9b5
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gnu/packages/samba.scm
View file

@ -9,6 +9,7 @@
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -43,6 +44,7 @@ (define-module (gnu packages samba)
#:use-module (gnu packages cups)
#:use-module (gnu packages databases)
#:use-module (gnu packages docbook)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages linux)
@ -175,14 +177,14 @@ (define (install dir)
(define-public samba
(package
(name "samba")
(version "4.12.7")
(version "4.13.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.samba.org/pub/samba/stable/"
"samba-" version ".tar.gz"))
(sha256
(base32 "1lkgih0vrarf5zy6chspkwarqdylzwr63nxr3qjkpazrs86nlm9h"))
(base32 "0pr805jmdl8gkm6g7gd78jrkmfwgybkvn2c949h51gcsbqxj2n14"))
(patches (search-patches "samba-fix-fcntl-hint-detection.patch"))
(modules '((guix build utils)))
(snippet
@ -194,16 +196,19 @@ (define-public samba
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'locate-docbook-stylesheets
(add-before 'configure 'setup-docbook-stylesheets
(lambda* (#:key inputs #:allow-other-keys)
;; XXX for some reason XML_CATALOG_FILES is not respected.
(substitute* '("buildtools/wafsamba/samba_conftests.py"
"buildtools/wafsamba/wafsamba.py"
"docs-xml/xslt/man.xsl")
(("http://docbook.sourceforge.net/release/xsl/current/")
(string-append (assoc-ref inputs "docbook-xsl")
"/xml/xsl/docbook-xsl-"
,(package-version docbook-xsl) "/")))
;; Append Samba's own DTDs to XML_CATALOG_FILES
;; (c.f. docs-xml/build/README).
(copy-file "docs-xml/build/catalog.xml.in"
"docs-xml/build/catalog.xml")
(substitute* "docs-xml/build/catalog.xml"
(("/@abs_top_srcdir@")
(string-append (getcwd) "/docs-xml")))
;; Honor XML_CATALOG_FILES.
(substitute* "buildtools/wafsamba/wafsamba.py"
(("XML_CATALOG_FILES=\"\\$\\{SAMBA_CATALOGS\\}" all)
(string-append all " $XML_CATALOG_FILES")))
#t))
(replace 'configure
;; samba uses a custom configuration script that runs waf.
@ -234,6 +239,7 @@ (define-public samba
`(("acl" ,acl)
("cups" ,cups)
;; ("gamin" ,gamin)
("dbus", dbus)
("gpgme" ,gpgme)
("gnutls" ,gnutls)
("jansson" ,jansson)
@ -256,11 +262,11 @@ (define-public samba
("pkg-config" ,pkg-config)
("python-iso8601" ,python-iso8601)
("rpcsvc-proto" ,rpcsvc-proto) ; for 'rpcgen'
;; For generating man pages.
("docbook-xml" ,docbook-xml-4.2)
("docbook-xsl" ,docbook-xsl)
("xsltproc" ,libxslt)))
("xsltproc" ,libxslt)
("libxml2", libxml2))) ;for XML_CATALOG_FILES
(home-page "https://www.samba.org/")
(synopsis
"The standard Windows interoperability suite of programs for GNU and Unix")