[packages/xorg-lib-libXdmcp] - updated to 1.1.3 (fixes CVE-2017-2625)

qboosh qboosh at pld-linux.org
Tue Mar 19 18:24:23 CET 2019


commit d52c2d5abf457b1c29f14c54f50e6b727008175f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Mar 19 18:30:15 2019 +0100

    - updated to 1.1.3 (fixes CVE-2017-2625)

 xorg-lib-libXdmcp.spec | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/xorg-lib-libXdmcp.spec b/xorg-lib-libXdmcp.spec
index 9500026..5f22291 100644
--- a/xorg-lib-libXdmcp.spec
+++ b/xorg-lib-libXdmcp.spec
@@ -1,22 +1,30 @@
+#
+# Conditional build:
+%bcond_without	libbsd	# libbsd arc4random instead of Linux implementation
+
 Summary:	X Display Manager Control Protocol library
 Summary(pl.UTF-8):	Biblioteka protokołu XDMCP
 Name:		xorg-lib-libXdmcp
-Version:	1.1.2
+Version:	1.1.3
 Release:	1
 License:	MIT
 Group:		X11/Libraries
-Source0:	http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-%{version}.tar.bz2
-# Source0-md5:	18aa5c1279b01f9d18e3299969665b2e
-URL:		http://xorg.freedesktop.org/
+Source0:	https://xorg.freedesktop.org/releases/individual/lib/libXdmcp-%{version}.tar.bz2
+# Source0-md5:	115c5c12ecce0e749cd91d999a5fd160
+URL:		https://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
 BuildRequires:	docbook-dtd43-xml
+%{!?with_libbsd:BuildRequires:	glibc-devel >= 6:2.25}
+%{?with_libbsd:BuildRequires:	libbsd-devel}
 BuildRequires:	libtool
 BuildRequires:	pkgconfig >= 1:0.19
 BuildRequires:	xmlto >= 0.0.22
 BuildRequires:	xorg-proto-xproto-devel
 BuildRequires:	xorg-sgml-doctools >= 1.8
 BuildRequires:	xorg-util-util-macros >= 1.16
+# getentropy() requires Linux 3.17+ (to avoid CVE-2017-2625 when building without libbsd)
+%{!?with_libbsd:Requires:	uname(release) >= 3.17}
 Obsoletes:	libXdmcp
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -72,7 +80,8 @@ Pakiet zawiera statyczną bibliotekę libXdmcp.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	%{!?with_libbsd:ac_cv_lib_bsd_arc4random_buf=no}
 %{__make}
 
 %install
@@ -81,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# (.html version) packaged as %doc
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/libXdmcp/xdmcp.*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -89,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS COPYING ChangeLog README.md
 %attr(755,root,root) %{_libdir}/libXdmcp.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libXdmcp.so.6
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-lib-libXdmcp.git/commitdiff/d52c2d5abf457b1c29f14c54f50e6b727008175f



More information about the pld-cvs-commit mailing list