guix
/
guix
mirror of git://git.savannah.gnu.org/guix.git
3
4
Fork 0
Code Issues Releases Wiki Activity

gnu: alpine: Update to 2.25. 

* gnu/packages/mail.scm (alpine): Update to 2.25.
[source]: Add patch.  Don't explicitly return #t from snippet.
[arguments]: Nor from phases.
* gnu/packages/patches/alpine-fix-privacy-policy-crash.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
This commit is contained in:
Tobias Geerinckx-Rice 2021-10-15 16:58:22 +02:00
parent ec2c7d4546
commit dfa2e5b44b
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/local.mk
View File

@ -837,6 +837,7 @@ dist_patch_DATA = \
%D%/packages/patches/akonadi-not-relocatable.patch \
%D%/packages/patches/akonadi-timestamps.patch \
%D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \
%D%/packages/patches/alpine-fix-privacy-policy-crash.patch \
%D%/packages/patches/anki-mpv-args.patch \
%D%/packages/patches/antiword-CVE-2014-8123.patch \
%D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \

15
gnu/packages/mail.scm
View File

@ -3708,7 +3708,7 @@ operators and scripters.")
(define-public alpine
(package
(name "alpine")
(version "2.24.2")
(version "2.25")
(source
(origin
(method git-fetch)
@ -3721,13 +3721,14 @@ operators and scripters.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0ibwss04j4qbhpd3jcw3d4xjf8jnmb9fi3sz58a99xw3awkfjabd"))
(base32 "0z6dp3cpz1dmbxw41ravsx1bxychafp0ij8gvj96mzz7rm9pdnq3"))
(modules '((guix build utils)))
(snippet
'(begin
;; Remove pre-built binaries scattered across the source repository.
(for-each delete-file (find-files "." "\\.(dll|exe)"))
#t))))
(for-each delete-file (find-files "." "\\.(dll|exe)"))))
(patches
(search-patches "alpine-fix-privacy-policy-crash.patch"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
@ -3753,14 +3754,12 @@ operators and scripters.")
;; ‘/etc/shadow exists in the build environment’. It does not.
(lambda _
(substitute* "configure"
(("test -f /etc/shadow") "true"))
#t))
(("test -f /etc/shadow") "true"))))
(add-after 'unpack 'make-reproducible
(lambda _
;; This removes time-dependent code to make alpine reproducible.
(substitute* "pico/blddate.c"
(("%02d-%s-%d") "1970-01-01"))
#t)))))
(("%02d-%s-%d") "1970-01-01")))))))
(inputs
`(("ncurses" ,ncurses)
("openssl" ,openssl)