guix - Wojtek's customized Guix

Age	Commit message (Expand)	Author
2014-06-22	gnu: kmod: Honor $LINUX_MODULE_DIRECTORY....	Ludovic Courtès
2014-06-22	gnu: Add udev....	Andreas Enge
2014-06-20	Merge branch 'core-updates'	Ludovic Courtès
2014-06-16	gnu: guile-ncurses: Work around missing test files....	Ludovic Courtès
2014-06-16	gnu: icu4c: Fix failing test....	Ludovic Courtès
2014-06-15	gnu: Add cook....	John Darrington
2014-06-13	gnu: Add pingus....	Eric Bavier
2014-06-13	gnu: Add busybox....	John Darrington
2014-06-05	gnu: openssl: Upgrade to 1.0.1h....	Mark H Weaver
2014-06-04	system: Tell module-init-tools where to look for modules....	Ludovic Courtès
2014-06-03	gnu: Merge Parted, fdisk, and ddrescue in (gnu packages disk)....	Ludovic Courtès
2014-06-02	Revert "gnu: hurd: Add Hurd Minimal."...	Ludovic Courtès
2014-06-01	gnu: hurd: Add Hurd Minimal....	Manolis Ragkousis
2014-06-01	gnu: util-linux: Remove dependency on Perl....	Ludovic Courtès
2014-05-31	Add (gnu system install)....	Ludovic Courtès
2014-05-28	gnu: Make gtk-glext depend on pangox-compat and remove workaround patch...	John Darrington
2014-05-28	gnu: Add cssc....	John Darrington
gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5027,7 +5027,7 @@ as OpenStreetMap, OpenCycleMap, OpenAerialMap and Maps.") vala curl gnutls ;for 'certtool' - httpd)) + httpd/pinned)) (propagated-inputs ;; libsoup-3.0.pc refers to all of these (except where otherwise noted) (list brotli diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a61eb9cbf4..8d5d94ced0 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -273,14 +273,14 @@ (define-public httpd (package (name "httpd") - (version "2.4.52") + (version "2.4.57") (source (origin (method url-fetch) (uri (string-append "mirror://apache/httpd/httpd-" version ".tar.bz2")) (sha256 (base32 - "1jgmfbazc2n9dnl7axhahwppyq25bvbvwx0lqplq76by97fgf9q1")))) + "0ajdz5f2w9nbmqydip2mv9m4xlnc4swmw7mqzgnrbq4mxr5bik6v")))) (build-system gnu-build-system) (native-inputs (list `(,pcre "bin"))) ;for 'pcre-config' (inputs (list apr apr-util openssl perl)) ; needed to run bin/apxs @@ -305,6 +305,21 @@ and its related documentation.") (license license:asl2.0) (home-page "https://httpd.apache.org/"))) +;; A package variant that may be out of date and vulnerable. Only for use in +;; test suites and should never be referred to by a built package. +(define-public httpd/pinned + (hidden-package + (package + (inherit httpd) + (version "2.4.52") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/httpd/httpd-" + version ".tar.bz2")) + (sha256 + (base32 + "1jgmfbazc2n9dnl7axhahwppyq25bvbvwx0lqplq76by97fgf9q1"))))))) + (define-public mod-wsgi (package (name "mod-wsgi")