From caeeb8887c6b4aed95ff6edb0faea235fe5894887ced9266ebbe8972f01e4c70 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 15 May 2012 09:25:00 +0000 Subject: [PATCH] Accepting request 121041 from home:vuntz:branches:X11:XOrg Rename xorg-x11-xtrans-devel to xtrans (with Provides/Obsoletes); when pushing to Factory, we'll need 'osc deleterequest -m "Renamed to xtrans" openSUSE:Factory xorg-x11-xtrans-devel' OBS-URL: https://build.opensuse.org/request/show/121041 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xtrans?expand=0&rev=1 --- .gitattributes | 23 ++++++ .gitignore | 1 + p_xauth.diff | 18 +++++ xtrans-1.2.7.tar.bz2 | 3 + xtrans.changes | 172 +++++++++++++++++++++++++++++++++++++++++++ xtrans.spec | 68 +++++++++++++++++ 6 files changed, 285 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 p_xauth.diff create mode 100644 xtrans-1.2.7.tar.bz2 create mode 100644 xtrans.changes create mode 100644 xtrans.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/p_xauth.diff b/p_xauth.diff new file mode 100644 index 0000000..f274521 --- /dev/null +++ b/p_xauth.diff @@ -0,0 +1,18 @@ +--- Xtranssock.c.orig 2009-10-16 23:25:57.000000000 +0200 ++++ Xtranssock.c 2010-04-04 16:10:29.000000000 +0200 +@@ -1790,12 +1790,15 @@ + + { + char hostnamebuf[256]; ++ char* xauthlocalname = getenv("XAUTHLOCALHOSTNAME"); + + TRANS(GetHostname) (hostnamebuf, sizeof (hostnamebuf)); + + if (strcmp (hostnamebuf, host) == 0) + { + return (1); ++ } else if(xauthlocalname && strcmp (xauthlocalname, host) == 0) { ++ return (1); + } else { + #if defined(IPv6) && defined(AF_INET6) + struct addrinfo *localhostaddr; diff --git a/xtrans-1.2.7.tar.bz2 b/xtrans-1.2.7.tar.bz2 new file mode 100644 index 0000000..aab991a --- /dev/null +++ b/xtrans-1.2.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f811191ba70a34a9994d165ea11a239e52c527f039b6e7f5011588f075fe1a6 +size 173025 diff --git a/xtrans.changes b/xtrans.changes new file mode 100644 index 0000000..f87da66 --- /dev/null +++ b/xtrans.changes @@ -0,0 +1,172 @@ +------------------------------------------------------------------- +Sun Apr 15 08:22:42 UTC 2012 - vuntz@opensuse.org + +- Rename source and binary package from xorg-x11-xtrans-devel to + xtrans. +- Add Provides/Obsoletes for xorg-x11-xtrans-devel to smooth + upgrades. +- Pass --docdir=%{_docdir}/xtrans to configure to install + xtrans.xml in the right doc directory, instead of + /usr/share/doc/xtrans/). + +------------------------------------------------------------------- +Wed Apr 11 18:21:01 UTC 2012 - vuntz@opensuse.org + +- Update to xtrans 1.2.7: + + Lot of cleanups, both from manual inspection and from automated + static code analysis + + Bug fixes, including: + - fix some resource & memory leaks + - avoid buffer overrun in SocketReopen + + Remove decnet leftover + + Remove SUN specific code, let solaris create .X11-pipe with + sticky bit on + + Documentation & build configuration improvments +- Include version of xtrans in the version of the package. For + instance, this will now be 7.6_1.2.7. +- Add pkgconfig(xorg-macros) BuildRequires. + +------------------------------------------------------------------- +Thu Mar 22 00:00:04 UTC 2012 - jengelh@medozas.de + +- Parallel build with %_smp_mflags; strip redundant sections/tags + +------------------------------------------------------------------- +Wed Jan 11 11:35:24 UTC 2012 - sndirsch@suse.com + +- fixed build on factory +- package build errors fixed + +------------------------------------------------------------------- +Tue Dec 21 02:52:02 UTC 2010 - sndirsch@novell.com + +- bumped version number to 7.6 + +------------------------------------------------------------------- +Tue Nov 9 06:10:24 UTC 2010 - sndirsch@novell.com + +- xtrans 1.2.6 + * This minor release converts the libxtrans API documentation + from troff to DocBook/XML and updates it for the current state + of the code. + It also includes some minor bug fixes, and of course, the usual + recent collection of build configuration improvements and + janitorial cleanups. + +------------------------------------------------------------------- +Sun Apr 4 16:05:52 CEST 2010 - sndirsch@suse.de + +- xtrans 1.2.5 +- adjusted p_xauth.diff +- bumped version number to 7.5 + +------------------------------------------------------------------- +Mon Dec 14 16:59:45 CET 2009 - jengelh@medozas.de + +- enable parallel building + +------------------------------------------------------------------- +Sat Aug 1 10:34:34 CEST 2009 - sndirsch@suse.de + +- xtrans 1.2.4 + * various fixes +- obsoletes xtrans-sig11.diff + +------------------------------------------------------------------- +Thu Feb 26 03:00:17 CET 2009 - sndirsch@suse.de + +- xtrans 1.2.3 + +------------------------------------------------------------------- +Sat Oct 25 11:28:30 CEST 2008 - sndirsch@suse.de + +- xtrans-sig11.diff + * Before accessing the string it needs to be checked if the + string isn't NULL. (Egbert Eich, bnc #419576) + +------------------------------------------------------------------- +Thu Sep 11 14:23:02 CEST 2008 - sndirsch@suse.de + +- bumped release number to 7.4 + +------------------------------------------------------------------- +Fri Jul 4 05:06:31 CEST 2008 - sndirsch@suse.de + +- xtrans 1.2.1 + * Connection failure for abstract socket is ECONNREFUSED, not + ENOENT. + * LocalClose() takes a ConnInfoPtr, not an fd + * Clear some pointer type mismatch warnings + * Ignore mkdir() errors when creating the abstract socket. + * Remove extraneous execute bit from .c file + * Launchd: This functionality has been moved into xorg-server + +------------------------------------------------------------------- +Thu May 8 21:08:30 CEST 2008 - sndirsch@suse.de + +- xtrans 1.2 + * Among other things, this release fixes the linux abstract + socket support which was broken in 1.1 (fdo bug#15677). Also + various bug fixes and win32 updates. + +------------------------------------------------------------------- +Thu Mar 6 07:59:54 CET 2008 - sndirsch@suse.de + +- xtrans 1.1 + +------------------------------------------------------------------- +Sat Sep 29 12:24:36 CEST 2007 - sndirsch@suse.de + +- bumped version to 7.3 + +------------------------------------------------------------------- +Fri Aug 24 15:38:22 CEST 2007 - sndirsch@suse.de + +- xtrans 1.0.4: + * Fix typo in Xtranslcl.c (sprintf with size argument should be + snprintf) + +------------------------------------------------------------------- +Mon Dec 18 11:05:09 CET 2006 - sndirsch@suse.de + +- updated to release 1.0.3 + * Makefile.am: make ChangeLog hook safer + +------------------------------------------------------------------- +Sat Oct 14 06:34:18 CEST 2006 - sndirsch@suse.de + +- updated to X.Org 7.2RC1 + +------------------------------------------------------------------- +Thu Aug 17 11:00:50 CEST 2006 - sndirsch@suse.de + +- removed xorg-x11-xproto-devel from BuildRequires to improve + autobuild deps + +------------------------------------------------------------------- +Sat Aug 5 22:50:32 CEST 2006 - sndirsch@suse.de + +- p_xauth.diff: + * Let X authorization be tolerant to hostname changes (Bug #98627) + +------------------------------------------------------------------- +Wed Aug 2 15:22:38 CEST 2006 - ro@suse.de + +- fix setup line + +------------------------------------------------------------------- +Fri Jul 28 14:45:37 CEST 2006 - sndirsch@suse.de + +- use "-fno-strict-aliasing" + +------------------------------------------------------------------- +Thu Jul 27 11:50:04 CEST 2006 - sndirsch@suse.de + +- use $RPM_OPT_FLAGS +- remove existing /usr/include/X11 symlink in %pre + +------------------------------------------------------------------- +Thu Jun 22 11:02:00 CEST 2006 - sndirsch@suse.de + +- created package + diff --git a/xtrans.spec b/xtrans.spec new file mode 100644 index 0000000..e78b9b3 --- /dev/null +++ b/xtrans.spec @@ -0,0 +1,68 @@ +# +# spec file for package xtrans +# +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: xtrans +Version: 1.2.7 +Release: 0 +Summary: Library to handle network protocol transport in X +License: MIT +Group: Development/Libraries/X11 +Url: http://xorg.freedesktop.org/ +Source: %{name}-%{version}.tar.bz2 +Patch: p_xauth.diff +BuildRequires: pkg-config +BuildRequires: pkgconfig(xorg-macros) >= 1.12 +Requires: xorg-x11-proto-devel +# Package was named xorg-x11-xtrans-devel until 12.2 +# We use 7.7 for Provides/Obsoletes, since we're renaming the packages when +# X11R7.7 is in RC1, and xorg-x11-xtrans-devel was version 7.6 +Provides: xorg-x11-xtrans-devel = 7.7 +Obsoletes: xorg-x11-xtrans-devel < 7.7 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch + +%description +xtrans is a library of code that is shared among various X packages to +handle network protocol transport in a modular fashion, allowing a +single place to add new transport types. It is used by the X server, +libX11, libICE, the X font server, and related components. + +%prep +%setup -q +%patch -p0 + +%build +%configure --docdir=%{_docdir}/xtrans +make %{?_smp_mflags} + +%install +%make_install + +%pre +test -L usr/include/X11 && rm usr/include/X11 +exit 0 + +%files +%defattr(-,root,root) +%doc AUTHORS ChangeLog COPYING README +%doc %{_docdir}/xtrans/xtrans.xml +%{_includedir}/X11/Xtrans/ +%{_datadir}/aclocal/xtrans.m4 +%{_datadir}/pkgconfig/xtrans.pc + +%changelog