Репозиторий Sisyphus
Последнее обновление: 18 ноября 2019 | Пакетов: 17519 | Посещений: 15776362
en ru br
Репозитории ALT

Группа :: Система/Библиотеки
Пакет: libXfont2

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: libXfont2-2.0.3.patch
Скачать


 .gear/rules                                        |  2 +
 .../tags/c40002ad2097d21c80faabe1c1db50a0e05d6ea3  | 23 ++++++
 .gear/tags/list                                    |  1 +
 Makefile.am                                        |  2 +-
 README                                             | 89 ---------------------
 README.md                                          | 90 ++++++++++++++++++++++
 configure.ac                                       |  2 +-
 libXfont.spec                                      | 76 ++++++++++++++++++
 src/fc/fserve.c                                    | 32 ++++----
 9 files changed, 210 insertions(+), 107 deletions(-)
diff --git a/.gear/rules b/.gear/rules
new file mode 100644
index 0000000..436d660
--- /dev/null
+++ b/.gear/rules
@@ -0,0 +1,2 @@
+tar: @name@-@version@:.
+diff: @name@-@version@:. . name=@name@-@version@.patch
diff --git a/.gear/tags/c40002ad2097d21c80faabe1c1db50a0e05d6ea3 b/.gear/tags/c40002ad2097d21c80faabe1c1db50a0e05d6ea3
new file mode 100644
index 0000000..0af763f
--- /dev/null
+++ b/.gear/tags/c40002ad2097d21c80faabe1c1db50a0e05d6ea3
@@ -0,0 +1,23 @@
+object cdb2f990348c3bd1407022f7e0e5fcba552d539f
+type commit
+tag libXfont2-2.0.3
+tagger Matthieu Herrb <matthieu@herrb.eu> 1511879418 +0100
+
+libXfont2-2.0.3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJaHXL6AAoJEGhzk+430Sj4Os4QAIUDgjvyfp6O9VeV1rIe8Xx5
+T0OMnmw+1nNCT0sQUNutXXTfp3M+GcYyvmODbbtj3odZ3vhQNH9703nk/k5RIXSX
+0K8W9WtBlEh/BziINOZqd4+U0jqYkGQiZgqZNZv6cMNwcNiF3VLCbgW0G3qUg9ak
+zUkU0xVPpY5DBbZUSIQLfHbVdDaFTuPsLKGz/IHptvLQSae/heLOYygPX5QfwRvb
+Vogj6ZMu7GUyrRm2gh3hAtxCC0Wdpj646EaYhvQpfStdFDtG+gAGKgg6nQtzTNA1
+dSDgKlCuSA+CCLAaVOYJljd+M3z8PHFjVfoBRqs10cmnDBMHmgaZ3d2WBaeAjME3
++CI1MdJGsf3B94AtBLRvh26jj5qWNliGO3wUf9cKMrHee+BQDpsEzxmkkyhwcy2M
+NtX1Ha9pY5b8RWXbG1klDbYnCA69fMtSNazYXK1DHMJfnckT1cMVzlcsnvNLqHdY
+zfuVHsyTQQBvRodg+xF8XN+Ajyriq/fzkz2SP4JTLU/Jm9DMf01H/zNO3UQBBx+v
+Wh139L1tQeakUaBhQWbDH+VmBJkuGzJ/FoGTka4o1hU66fpxaLerBC+OrNxHenjJ
+iP8MJ7B4vHhSY+8+lMvF5Pu77W5WAbcShqx6ehTOb5kcLuBfGwMqz2Gvg6O0YJMp
+Bi1pZWJ+l08Fgpodxp5y
+=mCPm
+-----END PGP SIGNATURE-----
diff --git a/.gear/tags/list b/.gear/tags/list
new file mode 100644
index 0000000..936f0c0
--- /dev/null
+++ b/.gear/tags/list
@@ -0,0 +1 @@
+c40002ad2097d21c80faabe1c1db50a0e05d6ea3 libXfont2-2.0.3
diff --git a/Makefile.am b/Makefile.am
index c1a3db2..7c0546e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -155,7 +155,7 @@ libXfont2_la_SOURCES +=			\
 	src/fc/fstrans.c
 endif
 
-EXTRA_DIST = src/builtins/buildfont
+EXTRA_DIST = src/builtins/buildfont README.md
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
diff --git a/README b/README
deleted file mode 100644
index de1512f..0000000
--- a/README
+++ /dev/null
@@ -1,89 +0,0 @@
-libXfont provides the core of the legacy X11 font system, handling the index
-files (fonts.dir, fonts.alias, fonts.scale), the various font file formats,
-and rasterizing them.  It is used by the X servers, and will eventually be
-used by the X Font Server (xfs), but should not be used by normal X11 clients.
-X11 clients access fonts via either the new APIs in libXft, or the legacy
-APIs in libX11.
-
-This version of libXfont is not compatible with xfs, or with the legacy
-bdftopcf utility; these packages require libXfont 1.5, not libXfont 2.0
-or later. The two versions can be installed in parallel, and eventually
-the need for 1.5 will go away. We apologize for the inconvenience.
-
-libXfont supports a number of compression and font formats, and the
-configure script takes various options to enable or disable them:
-
- -- Compression types:
-
-    gzip - always enabled, no option to disable, requires libz
-
-    bzip2 - disabled by default, enable via --with-bzip2, requires libbz2
-
- -- Font formats:
-
-    builtins - copies of the "fixed" & "cursor" fonts required by the
-            X protocol are built into the library so the X server always
-            has the fonts it requires to start up.   Accessed via the
-            special 'built-ins' entry in the X server font path.
-            Enabled by default, disable via --disable-builtins.
-
-    freetype - handles scalable font formats including OpenType, FreeType,
-            and PostScript formats.  Requires FreeType2 library.
-            Can also be used to handle bdf & bitmap pcf font formats.
-            Enabled by default, disable via --disable-freetype.
-
-    bdf bitmap fonts - text file format for distributing fonts, described
-            in http://www.x.org/docs/BDF/bdf.pdf specification.  Normally
-            not used by the X server at runtime, as the fonts distributed
-            by X.Org in bdf format are compiled with bdftopcf when
-            installing/packaging them.
-            Enabled by default, disable via --disable-bdfformat.
-
-    pcf bitmap fonts - standard bitmap font format since X11R5 in 1991,
-            used for all bitmap fonts installed from X.Org packages.
-            Compiled format is architecture independent.
-            As noted above, usually produced by bdftopcf.
-            Enabled by default, disable via --disable-pcfformat.
-
-    snf bitmap fonts - standard bitmap font format prior to X11R5 in 1991,
-            remains only for backwards compatibility.  Unlike pcf, snf files
-            are architecture specific, and contain less font information
-            than pcf files.  snf fonts are deprecated and support for them
-            may be removed in future libXfont releases.
-            Disabled by default, enable via --disable-snfformat.
-
- -- Font services:
-
-    xfs font servers - allows retreiving fonts as a client of an xfs server.
-            Enabled by default, disable via --disable-fc (font client).
-
-            If enabled, you can also use the standard libxtrans flags to
-            configure which transports can be used to connect to xfs:
-              --enable-unix-transport Enable UNIX domain socket transport
-              --enable-tcp-transport  Enable TCP socket transport (IPv4)
-              --enable-ipv6           Enable IPv6 support for tcp-transport
-              --enable-local-transport Enable os-specific local transport
-            (Change --enable to --disable to force disabling support.)
-            The default setting is to enable all of the transports the
-            configure script can find OS support for.
-
---------------------------------------------------------------------------
-
-Please submit bugs & patches to the Xorg bugzilla:
-
-	https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
-	http://lists.freedesktop.org/mailman/listinfo/xorg
-
-The master development code repository can be found at:
-
-	git://anongit.freedesktop.org/git/xorg/lib/libXfont
-
-	http://cgit.freedesktop.org/xorg/lib/libXfont
-
-For more information on the git code manager, see:
-
-	http://wiki.x.org/wiki/GitPage
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..868b8a5
--- /dev/null
+++ b/README.md
@@ -0,0 +1,90 @@
+libXfont - X font handling library for server & utilities
+---------------------------------------------------------
+
+libXfont provides the core of the legacy X11 font system, handling the index
+files (fonts.dir, fonts.alias, fonts.scale), the various font file formats,
+and rasterizing them.  It is used by the X servers, and will eventually be
+used by the X Font Server (xfs), but should not be used by normal X11 clients.
+X11 clients access fonts via either the new APIs in libXft, or the legacy
+APIs in libX11.
+
+This version of libXfont is not compatible with xfs, or with the legacy
+bdftopcf utility; these packages require libXfont 1.5, not libXfont 2.0
+or later. The two versions can be installed in parallel, and eventually
+the need for 1.5 will go away. We apologize for the inconvenience.
+
+libXfont supports a number of compression and font formats, and the
+configure script takes various options to enable or disable them:
+
+- Compression types:
+
+  * gzip - always enabled, no option to disable, requires libz
+
+  * bzip2 - disabled by default, enable via --with-bzip2, requires libbz2
+
+- Font formats:
+
+  * builtins - copies of the "fixed" & "cursor" fonts required by the
+    X protocol are built into the library so the X server always
+    has the fonts it requires to start up.   Accessed via the
+    special 'built-ins' entry in the X server font path.  
+    Enabled by default, disable via --disable-builtins.
+
+  * freetype - handles scalable font formats including OpenType, FreeType,
+    and PostScript formats.  Requires FreeType2 library.
+    Can also be used to handle bdf & bitmap pcf font formats.  
+    Enabled by default, disable via --disable-freetype.
+
+  * bdf bitmap fonts - text file format for distributing fonts, described
+    in https://www.x.org/docs/BDF/bdf.pdf specification.  Normally
+    not used by the X server at runtime, as the fonts distributed
+    by X.Org in bdf format are compiled with bdftopcf when
+    installing/packaging them.  
+    Enabled by default, disable via --disable-bdfformat.
+
+  * pcf bitmap fonts - standard bitmap font format since X11R5 in 1991,
+    used for all bitmap fonts installed from X.Org packages.
+    Compiled format is architecture independent.
+    As noted above, usually produced by bdftopcf.  
+    Enabled by default, disable via --disable-pcfformat.
+
+  * snf bitmap fonts - standard bitmap font format prior to X11R5 in 1991,
+    remains only for backwards compatibility.  Unlike pcf, snf files
+    are architecture specific, and contain less font information
+    than pcf files.  snf fonts are deprecated and support for them
+    may be removed in future libXfont releases.  
+    Disabled by default, enable via --disable-snfformat.
+
+- Font services:
+
+  * xfs font servers - allows retreiving fonts as a client of an xfs server.  
+    Enabled by default, disable via --disable-fc (font client).
+
+    If enabled, you can also use the standard libxtrans flags to
+    configure which transports can be used to connect to xfs:
+    
+        --enable-unix-transport  Enable UNIX domain socket transport
+        --enable-tcp-transport   Enable TCP socket transport (IPv4)
+        --enable-ipv6            Enable IPv6 support for tcp-transport
+        --enable-local-transport Enable os-specific local transport
+
+    (Change --enable to --disable to force disabling support.)  
+    The default setting is to enable all of the transports the
+    configure script can find OS support for.
+
+--------------------------------------------------------------------------
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+  https://lists.x.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+  https://gitlab.freedesktop.org/xorg/lib/libXfont
+
+Please submit bug reports and requests to merge patches there.
+
+For patch submission instructions, see:
+
+  https://www.x.org/wiki/Development/Documentation/SubmittingPatches
diff --git a/configure.ac b/configure.ac
index f3b4a7a..9df20cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([libXfont2], [2.0.3],
-	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXfont2])
+	[https://gitlab.freedesktop.org/xorg/lib/libXfont/issues], [libXfont2])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 
diff --git a/libXfont.spec b/libXfont.spec
new file mode 100644
index 0000000..995168a
--- /dev/null
+++ b/libXfont.spec
@@ -0,0 +1,76 @@
+Name: libXfont2
+Version: 2.0.3
+Release: alt2
+Summary: X.Org libXfont runtime library
+License: MIT/X11
+Group: System/Libraries
+Url: http://xorg.freedesktop.org
+Packager: Valery Inozemtsev <shrek@altlinux.ru>
+
+Source: %name-%version.tar
+Patch: %name-%version.patch
+
+BuildRequires(pre): rpm-build-ubt
+BuildRequires: bzlib-devel libfontenc-devel libfreetype-devel xorg-proto-devel
+BuildRequires: xorg-xtrans-devel xorg-util-macros zlib-devel
+#BuildRequires: fop xorg-sgml-doctools xmlto
+
+%description
+libXfont provides the core of the legacy X11 font system, handling the
+index files (fonts.dir, fonts.alias, fonts.scale), the various font file
+formats, and rasterizing them.   It is used by the X servers, the
+X Font Server (xfs), and some font utilities (bdftopcf for instance),
+but should not be used by normal X11 clients.  X11 clients access fonts
+via either the new API's in libXft, or the legacy API's in libX11.
+
+%package devel
+Summary: X.Org libXfont development package
+Group: Development/C
+Requires: %name = %version-%release
+
+%description devel
+This package contains the libXfont development library and header files
+
+%def_enable ipv6
+
+%prep
+%setup -q
+%patch -p1
+
+%build
+%autoreconf
+%configure \
+	--with-bzip2 \
+	%{subst_enable ipv6} \
+	--disable-devel-docs \
+	--disable-static
+%make_build
+
+%install
+%make DESTDIR=%buildroot install
+
+%files
+%_libdir/*.so.*
+
+%files devel
+%_includedir/X11/fonts
+%_libdir/*.so
+%_pkgconfigdir/*.pc
+
+%changelog
+* Tue Apr 02 2019 Valery Inozemtsev <shrek@altlinux.ru> 2.0.3-alt2
+- removed ubt
+
+* Mon Dec 04 2017 Valery Inozemtsev <shrek@altlinux.ru> 2.0.3-alt1.S1
+- fixes:
+ + CVE-2017-16611 Open files with O_NOFOLLOW
+
+* Fri Oct 20 2017 Valery Inozemtsev <shrek@altlinux.ru> 2.0.2-alt1
+- 2.0.2
+
+* Fri Jan 13 2017 Michael Shigorin <mike@altlinux.org> 2.0.1-alt1.1
+- BOOTSTRAP: dropped docs-related BRs (unused)
+
+* Wed Nov 30 2016 Valery Inozemtsev <shrek@altlinux.ru> 2.0.1-alt1
+- 2.0.1
+
diff --git a/src/fc/fserve.c b/src/fc/fserve.c
index 708fc35..acea577 100644
--- a/src/fc/fserve.c
+++ b/src/fc/fserve.c
@@ -223,8 +223,8 @@ _fs_add_rep_log (FSFpePtr conn, fsGenericReply *rep)
             fprintf (stderr, "Error: %d Request: %s\n",                 \
                      ((fsError *)rep)->request, #name);                 \
         else                                                            \
-            fprintf (stderr, "Bad Length for %s Reply: %d %s %d\n",     \
-                     #name, rep->length, op, LENGTHOF(name));           \
+            fprintf (stderr, "Bad Length for %s Reply: %u %s %d\n",     \
+                     #name, (unsigned) rep->length, op, LENGTHOF(name));\
     }                                                                   \
 } while (0)
 
@@ -933,8 +933,8 @@ fs_read_query_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
 	ret = -1;
 #ifdef DEBUG
 	fprintf(stderr,
-		"fsQueryXInfo: bufleft (%ld) / SIZEOF(fsPropOffset) < %d\n",
-		bufleft, pi->num_offsets);
+		"fsQueryXInfo: bufleft (%ld) / SIZEOF(fsPropOffset) < %u\n",
+		bufleft, (unsigned) pi->num_offsets);
 #endif
 	goto bail;
     }
@@ -947,8 +947,8 @@ fs_read_query_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
 	ret = -1;
 #ifdef DEBUG
 	fprintf(stderr,
-		"fsQueryXInfo: bufleft (%ld) < data_len (%d)\n",
-		bufleft, pi->data_len);
+		"fsQueryXInfo: bufleft (%ld) < data_len (%u)\n",
+		bufleft, (unsigned) pi->data_len);
 #endif
 	goto bail;
     }
@@ -1081,8 +1081,8 @@ fs_read_extent_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
 			    / LENGTHOF(fsXCharInfo))) {
 #ifdef DEBUG
 	fprintf(stderr,
-		"fsQueryXExtents16: numExtents (%d) > (%d - %d) / %d\n",
-		numExtents, rep->length,
+		"fsQueryXExtents16: numExtents (%d) > (%u - %d) / %d\n",
+		numExtents, (unsigned) rep->length,
 		LENGTHOF(fsQueryXExtents16Reply), LENGTHOF(fsXCharInfo));
 #endif
 	pCI = NULL;
@@ -1957,8 +1957,8 @@ fs_read_glyphs(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
     {
 #ifdef DEBUG
 	fprintf(stderr,
-		"fsQueryXBitmaps16: num_chars (%d) > bufleft (%ld) / %d\n",
-		rep->num_chars, bufleft, SIZEOF (fsOffset32));
+		"fsQueryXBitmaps16: num_chars (%u) > bufleft (%ld) / %d\n",
+		(unsigned) rep->num_chars, bufleft, SIZEOF (fsOffset32));
 #endif
 	err = AllocError;
 	goto bail;
@@ -1971,8 +1971,8 @@ fs_read_glyphs(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
     {
 #ifdef DEBUG
 	fprintf(stderr,
-		"fsQueryXBitmaps16: nbytes (%d) > bufleft (%ld)\n",
-		rep->nbytes, bufleft);
+		"fsQueryXBitmaps16: nbytes (%u) > bufleft (%ld)\n",
+		(unsigned) rep->nbytes, bufleft);
 #endif
 	err = AllocError;
 	goto bail;
@@ -2573,8 +2573,8 @@ fs_read_list_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
     if (pi->num_offsets > (bufleft / SIZEOF (fsPropOffset))) {
 #ifdef DEBUG
 	fprintf(stderr,
-		"fsListFontsWithXInfo: offset length (%d * %d) > bufleft (%ld)\n",
-		pi->num_offsets, (int) SIZEOF (fsPropOffset), bufleft);
+		"fsListFontsWithXInfo: offset length (%u * %d) > bufleft (%ld)\n",
+		(unsigned) pi->num_offsets, (int) SIZEOF (fsPropOffset), bufleft);
 #endif
 	err = AllocError;
 	goto done;
@@ -2585,8 +2585,8 @@ fs_read_list_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
     if (pi->data_len > bufleft) {
 #ifdef DEBUG
 	fprintf(stderr,
-		"fsListFontsWithXInfo: data length (%d) > bufleft (%ld)\n",
-		pi->data_len, bufleft);
+		"fsListFontsWithXInfo: data length (%u) > bufleft (%ld)\n",
+		(unsigned) pi->data_len, bufleft);
 #endif
 	err = AllocError;
 	goto done;
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin