me/guix
Archived
1
0
Fork 0
Code Activity

gnu: alpine: Update to 2.25.

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