diff --git a/.gitignore b/.gitignore index f7c377f..f2a781c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,10 @@ -libXext-1.0.99.1.tar.bz2 +libXext-1.1.2.tar.bz2 +/libXext-1.2.0.tar.bz2 +/libXext-1.3.0.tar.bz2 +/libXext-1.3.1.tar.bz2 +/libXext-20130524.tar.bz2 +/libXext-1.3.2.tar.bz2 +/libXext-1.3.3.tar.bz2 +/libXext-1.3.4.tar.bz2 +/libXext-1.3.5.tar.xz +/libXext-1.3.6.tar.xz diff --git a/commitid b/commitid new file mode 100644 index 0000000..f6993ae --- /dev/null +++ b/commitid @@ -0,0 +1 @@ +dfe6e1f3b8ede3d0bab7a5fa57f73513a09ec649 diff --git a/libXext-1.0.99.1-manpage.patch b/libXext-1.0.99.1-manpage.patch deleted file mode 100644 index 12a1368..0000000 --- a/libXext-1.0.99.1-manpage.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cad77b1d6d1a344f2cb31c16401076c003bb97dd Mon Sep 17 00:00:00 2001 -From: Imranullah Syed -Date: Thu, 19 Feb 2009 18:02:26 +1000 -Subject: [PATCH 2/2] Corrected order of arguments in man page for function: XShmCreateImage - -Signed-off-by: Peter Hutterer ---- - man/XShm.man | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/man/XShm.man b/man/XShm.man -index 2e37997..64f292c 100644 ---- a/man/XShm.man -+++ b/man/XShm.man -@@ -90,10 +90,11 @@ Status XShmDetach( - XImage *XShmCreateImage ( - Display *display; - Visual *visual; -- unsigned int depth, width, height; -+ unsigned int depth; - int format; - char *data; -- XShmSegmentInfo *shminfo); -+ XShmSegmentInfo *shminfo; -+ unsigned int width, height); - .LP - Status XShmPutImage( - Display *display; --- -1.6.2.2.447.g4afa7 - diff --git a/libXext-1.0.99.1-silence-xge.patch b/libXext-1.0.99.1-silence-xge.patch deleted file mode 100644 index f007853..0000000 --- a/libXext-1.0.99.1-silence-xge.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8a91fc6f72206362f399b5e29bf3d5f44f4eb822 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 10 Feb 2009 07:45:32 +1000 -Subject: [PATCH 1/2] Silence "Generic Event Extension missing on display" warning. - -If we're already doing a check anyway, we don't need to print an extra -warning. - -Signed-off-by: Peter Hutterer ---- - src/Xge.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/src/Xge.c b/src/Xge.c -index 90fbce5..6991553 100644 ---- a/src/Xge.c -+++ b/src/Xge.c -@@ -161,8 +161,7 @@ cleanup: - static Bool - _xgeCheckExtension(Display* dpy, XExtDisplayInfo* info) - { -- XextCheckExtension(dpy, info, xge_extension_name, False); -- return True; -+ return XextHasExtension(info); - } - - --- -1.6.2.2.447.g4afa7 - diff --git a/libXext-1.0.99.1-xsync.patch b/libXext-1.0.99.1-xsync.patch deleted file mode 100644 index 520fd1f..0000000 --- a/libXext-1.0.99.1-xsync.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f467d17ae5a89aa1a2b8c7260334f41e8ee2d08c Mon Sep 17 00:00:00 2001 -From: Kim Woelders -Date: Fri, 17 Oct 2008 16:53:29 -0400 -Subject: [PATCH] Bug #17774: Allocate the right size in XSyncListSystemCounters. - ---- - src/XSync.c | 8 +++----- - 1 files changed, 3 insertions(+), 5 deletions(-) - -diff --git a/src/XSync.c b/src/XSync.c -index 61f8600..9f266a5 100644 ---- a/src/XSync.c -+++ b/src/XSync.c -@@ -1,4 +1,3 @@ --/* $Xorg: XSync.c,v 1.5 2001/02/09 02:03:49 xorgcvs Exp $ */ - /* - - Copyright 1991, 1993, 1998 The Open Group -@@ -287,11 +286,10 @@ XSyncListSystemCounters(Display *dpy, int *n_counters_return) - int replylen; - int i; - -- list = (XSyncSystemCounter *)Xmalloc( -- rep.nCounters * sizeof(XSyncSystemCounter)); -+ list = Xmalloc(rep.nCounters * sizeof(XSyncSystemCounter)); - replylen = rep.length << 2; -- pWireSysCounter = (xSyncSystemCounter *) Xmalloc ((unsigned) replylen + 1); -- /* +1 to leave room for last null-terminator */ -+ pWireSysCounter = Xmalloc ((unsigned) replylen + sizeof(XSyncCounter)); -+ /* +1 to leave room for last counter read-ahead */ - - if ((!list) || (!pWireSysCounter)) - { --- -1.6.2.2.447.g4afa7 - diff --git a/libXext.spec b/libXext.spec index 8741b52..2d03722 100644 --- a/libXext.spec +++ b/libXext.spec @@ -1,52 +1,48 @@ +%global tarball libXext +#global gitdate 20130524 +%global gitversion dfe6e1f3b + Summary: X.Org X11 libXext runtime library Name: libXext -Version: 1.0.99.1 -Release: 3%{?dist} -License: MIT -Group: System Environment/Libraries +Version: 1.3.6 +Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +License: MIT-open-group AND X11 AND HPND AND HPND-sell-variant AND SMLNJ AND MIT AND ISC AND HPND-doc AND HPND-doc-sell URL: http://www.x.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 -Source0: http://cgit.freedesktop.org/xorg/lib/libXext/snapshot/libXext-1.0.99.1.tar.bz2 +%if 0%{?gitdate} +Source0: %{tarball}-%{gitdate}.tar.bz2 +Source1: make-git-snapshot.sh +Source2: commitid +%else +Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.xz +%endif -# All three cherry-picked from upstream -Patch1: libXext-1.0.99.1-manpage.patch -Patch2: libXext-1.0.99.1-silence-xge.patch -Patch3: libXext-1.0.99.1-xsync.patch +Requires: libX11 >= 1.5.99.902 - -BuildRequires: xorg-x11-proto-devel >= 7.1-10 -BuildRequires: libX11-devel +BuildRequires: make +BuildRequires: autoconf automake libtool +BuildRequires: xorg-x11-proto-devel >= 7.4-23 +BuildRequires: libX11-devel >= 1.5.99.902 BuildRequires: libXau-devel BuildRequires: xorg-x11-util-macros BuildRequires: autoconf automake libtool pkgconfig +BuildRequires: xmlto %description X.Org X11 libXext runtime library %package devel Summary: X.Org X11 libXext development package -Group: Development/Libraries -Requires(pre): xorg-x11-filesystem >= 0.99.2-3 Requires: %{name} = %{version}-%{release} -Requires: libX11-devel pkgconfig -# xorg-x11-proto-devel is needed by xext.pc -Requires: xorg-x11-proto-devel >= 7.0-1 - - %description devel X.Org X11 libXext development package %prep -%setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %build -./autogen.sh +autoreconf -v --install --force %configure --disable-static make %{?_smp_mflags} @@ -58,32 +54,205 @@ make install DESTDIR=$RPM_BUILD_ROOT # We intentionally don't ship *.la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -%clean -rm -rf $RPM_BUILD_ROOT +# do this with %%doc below +rm -rf $RPM_BUILD_ROOT%{_docdir} -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_post +%ldconfig_postun %files -%defattr(-,root,root,-) %doc AUTHORS COPYING %{_libdir}/libXext.so.6 %{_libdir}/libXext.so.6.4.0 %files devel -%defattr(-,root,root,-) +%{_includedir}/X11/extensions/MITMisc.h +%{_includedir}/X11/extensions/XEVI.h +%{_includedir}/X11/extensions/XLbx.h +%{_includedir}/X11/extensions/XShm.h +%{_includedir}/X11/extensions/Xag.h +%{_includedir}/X11/extensions/Xcup.h +%{_includedir}/X11/extensions/Xdbe.h +%{_includedir}/X11/extensions/Xext.h +%{_includedir}/X11/extensions/Xge.h +%{_includedir}/X11/extensions/dpms.h +%{_includedir}/X11/extensions/extutil.h +%{_includedir}/X11/extensions/multibuf.h +%{_includedir}/X11/extensions/security.h +%{_includedir}/X11/extensions/shape.h +%{_includedir}/X11/extensions/sync.h +%{_includedir}/X11/extensions/xtestext1.h %{_libdir}/libXext.so %{_libdir}/pkgconfig/xext.pc #%dir %{_mandir}/man3x %{_mandir}/man3/*.3* %changelog -* Mon Apr 20 2009 Peter Hutterer - 1.0.99.1-3 -- libXext-1.0.99.1-silence-xge.patch: don't print a warning if XGE is - missing (#477677). -- libXext-1.0.99.1-manpage.patch: fix XShmCreateImage(3) argument order -- libXext-1.0.99.1-xsync.patch: allocate the right size of counters in - XSyncListSystemCounters. +* Thu Jul 24 2025 Fedora Release Engineering - 1.3.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jan 17 2025 Fedora Release Engineering - 1.3.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 18 2024 Fedora Release Engineering - 1.3.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Feb 05 2024 José Expósito - 1.3.6-1 +- libXext 1.3.6-1 + +* Thu Jan 25 2024 Fedora Release Engineering - 1.3.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.3.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Oct 02 2023 Benjamin Tissoires - 1.3.5-4 +- SPDX migration + +* Thu Jul 20 2023 Fedora Release Engineering - 1.3.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Nov 04 2022 Benjamin Tissoires 1.3.5-1 +- libXext 1.3.5-1 + +* Thu Jul 21 2022 Fedora Release Engineering - 1.3.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 1.3.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.3.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1.3.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Nov 5 11:24:29 AEST 2020 Peter Hutterer - 1.3.4-5 +- Add BuildRequires for make + +* Tue Jul 28 2020 Fedora Release Engineering - 1.3.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 1.3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Mar 19 2019 Peter Hutterer 1.3.4-1 +- libXext 1.3.4 + +* Fri Feb 01 2019 Fedora Release Engineering - 1.3.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.3.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Jun 29 2018 Adam Jackson - 1.3.3-9 +- Use ldconfig scriptlet macros + +* Wed Feb 07 2018 Fedora Release Engineering - 1.3.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.3.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.3.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.3.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 1.3.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jan 28 2016 Peter Hutterer +- Remove unnecessary defattr + +* Wed Jun 17 2015 Fedora Release Engineering - 1.3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering - 1.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Thu Jul 24 2014 Peter Hutterer 1.3.3-1 +- libXext 1.3.3 + +* Tue Jul 22 2014 Benjamin Tissoires 1.3.2-4 +- Xge: remove warning messages about missing Xge extension event translations (rhbz #1122011) + +* Sat Jun 07 2014 Fedora Release Engineering - 1.3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 1.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Jun 03 2013 Peter Hutterer 1.3.2-1 +- libXext 1.3.2 + +* Mon May 27 2013 Peter Hutterer - 1.3.1-6.20130524gitdfe6e1f3b +- Really require libX11 1.6RC2 for _XEatDataWords + +* Mon May 27 2013 Peter Hutterer - 1.3.1-5.20130524gitdfe6e1f3b +- Require libX11 1.6RC2 for _XEatDataWords + +* Fri May 24 2013 Peter Hutterer 1.3.1-3.20130524gitdfe6e1f3b +- Update to git snapshot to fix CVEs listed below +- CVE-2013-1982 + +* Thu Mar 07 2013 Peter Hutterer - 1.3.1-4 +- autoreconf for aarch64 + +* Thu Feb 14 2013 Fedora Release Engineering - 1.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 1.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Mar 08 2012 Adam Jackson 1.3.1-1 +- libXext 1.3.1 + +* Fri Jan 13 2012 Fedora Release Engineering - 1.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Nov 17 2011 Adam Jackson 1.3.0-1 +- libXext 1.3.0 + +* Mon Feb 07 2011 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Oct 28 2010 Adam Jackson 1.2.0-1 +- libXext 1.2.0 + +* Tue Aug 24 2010 Adam Tkac 1.1.2-2 +- rebuild to ensure F14 NVR is higher than F13 + +* Fri Jun 04 2010 Adam Jackson 1.1.2-1 +- libXext 1.1.2 + +* Sat Dec 12 2009 Robert Scheck 1.1-2 +- libXext-1.1-XAllocID.patch: call XAllocID with the display lock held. +- libXext-1.1-event_vec-smash.patch: don't smash the event processing vector + if the server has an older extension version than the client. + +* Tue Oct 06 2009 Adam Jackson 1.1-1 +- libXext 1.1 + +* Fri Jul 24 2009 Fedora Release Engineering - 1.0.99.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jul 23 2009 Adam Jackson 1.0.99.4-2 +- Un-require xorg-x11-filesystem + +* Wed Jul 22 2009 Peter Hutterer 1.0.99.4-1 +- libXext 1.0.99.4 +- fix.patch: Drop. + +* Tue Jul 21 2009 Adam Jackson 1.0.99.2-0 +- libXext snapshot * Wed Feb 25 2009 Fedora Release Engineering - 1.0.99.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh new file mode 100755 index 0000000..9399b57 --- /dev/null +++ b/make-git-snapshot.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +DIRNAME=libXext-$( date +%Y%m%d ) + +rm -rf $DIRNAME +git clone git://git.freedesktop.org/git/xorg/lib/libXext $DIRNAME +cd $DIRNAME +if [ -z "$1" ]; then + git log | head -1 +else + git checkout $1 +fi +git log | head -1 | awk '{ print $2 }' > ../commitid +git repack -a -d +cd .. +tar jcf $DIRNAME.tar.bz2 $DIRNAME +rm -rf $DIRNAME diff --git a/sources b/sources index 63b1a2b..e8cfe81 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -28a0c215dca5960405634242e0f5957c libXext-1.0.99.1.tar.bz2 +SHA512 (libXext-1.3.6.tar.xz) = fd7693b5698cc4f5e80002a2cd4bd88e5d52c755c19a0417ee73029bd65f9d77b0969e765a1febc4d8fce1ba5dfb7278717f47be742e33d8fc5eb941e769792e