[xorg-x11-drv-nvidia] Update the triggerin to insert the new cmdline
by Nicolas Chauvet
commit 22bc7003b718543d95ed31fa1cd342b88954a8b7
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue May 30 16:35:44 2017 +0200
Update the triggerin to insert the new cmdline
xorg-x11-drv-nvidia.spec | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 2833e97..a1d67dd 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -31,7 +31,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 2
Version: 375.66
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -393,7 +393,21 @@ if [ "$1" -eq "1" ]; then
fi || :
%if 0%{?fedora} || 0%{?rhel} >= 7
-%triggerin -- xorg-x11-drv-nvidia < 2:375.66-1
+%triggerin -- xorg-x11-drv-nvidia < 2:375.66-4
+if [ -f %{_sysconfdir}/default/grub ] ; then
+ . %{_sysconfdir}/default/grub
+ if [ -z "${GRUB_CMDLINE_LINUX+x}" ]; then
+ echo -e GRUB_CMDLINE_LINUX=\"%{_dracutopts}\" >> %{_sysconfdir}/default/grub
+ else
+ for i in %{_dracutopts} ; do
+ _has_string=$(echo ${GRUB_CMDLINE_LINUX} | fgrep -c $i)
+ if [ x"$_has_string" = x0 ] ; then
+ GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX} ${i}"
+ fi
+ done
+ sed -i -e "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"${GRUB_CMDLINE_LINUX}\"/g" %{_sysconfdir}/default/grub
+ fi
+fi
%{_grubby} --args='%{_dracutopts}' &>/dev/null || :
%endif
@@ -570,6 +584,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Tue May 30 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-4
+- Update the triggerin to insert the new cmdline
+
* Tue May 30 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:375.66-3
- Revert 10_nvidia.json rename
6 years, 11 months
[xorg-x11-drv-nvidia/f25] Revert 10_nvidia.json rename
by Leigh Scott
commit ed7eca715c72fa5dc3be696bc8f40e73b67b5c41
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue May 30 10:57:36 2017 +0100
Revert 10_nvidia.json rename
xorg-x11-drv-nvidia.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 7617d1d..2833e97 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -31,7 +31,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 2
Version: 375.66
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -274,7 +274,7 @@ install -p -m 0644 nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/
%endif
# EGL config
install -m 0755 -d %{buildroot}%{_datadir}/glvnd/egl_vendor.d/
-install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/90_nvidia.json
+install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json
# ld.so.conf.d file
%if ! 0%{?fedora} >= 25
@@ -448,7 +448,7 @@ fi ||:
%ifarch x86_64 i686
%{_datadir}/vulkan/icd.d/nvidia_icd.json
%endif
-%{_datadir}/glvnd/egl_vendor.d/90_nvidia.json
+%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json
%dir %{_sysconfdir}/nvidia
%ghost %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
%ghost %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
@@ -570,6 +570,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Tue May 30 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:375.66-3
+- Revert 10_nvidia.json rename
+
* Fri May 12 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-2
- Add epoch for triggerin
6 years, 11 months
[xorg-x11-drv-nvidia] Revert 10_nvidia.json rename
by Leigh Scott
commit 2c4de6cbc5a802274a29c932410b212510382151
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue May 30 10:57:36 2017 +0100
Revert 10_nvidia.json rename
xorg-x11-drv-nvidia.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 7617d1d..2833e97 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -31,7 +31,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 2
Version: 375.66
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -274,7 +274,7 @@ install -p -m 0644 nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/
%endif
# EGL config
install -m 0755 -d %{buildroot}%{_datadir}/glvnd/egl_vendor.d/
-install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/90_nvidia.json
+install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json
# ld.so.conf.d file
%if ! 0%{?fedora} >= 25
@@ -448,7 +448,7 @@ fi ||:
%ifarch x86_64 i686
%{_datadir}/vulkan/icd.d/nvidia_icd.json
%endif
-%{_datadir}/glvnd/egl_vendor.d/90_nvidia.json
+%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json
%dir %{_sysconfdir}/nvidia
%ghost %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
%ghost %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
@@ -570,6 +570,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Tue May 30 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:375.66-3
+- Revert 10_nvidia.json rename
+
* Fri May 12 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-2
- Add epoch for triggerin
6 years, 11 months
[freetype-freeworld/f24] Add freetype-2.6.3-pcf-encoding.patch from Fedora freetype (rh#1451795)
by Kevin Kofler
commit 9e20f4d46cb6d3081946ac983e877c44c845de23
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Sun May 28 10:28:51 2017 +0200
Add freetype-2.6.3-pcf-encoding.patch from Fedora freetype (rh#1451795)
* Sun May 28 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.6.3-4
- Add freetype-2.6.3-pcf-encoding.patch from Fedora freetype: Accept
ISO646.1991-IRV as a Unicode charmap in PCF and BDF drivers (rh#1451795)
freetype-2.6.3-pcf-encoding.patch | 58 +++++++++++++++++++++++++++++++++++++++
freetype-freeworld.spec | 20 ++++++++++----
2 files changed, 73 insertions(+), 5 deletions(-)
---
diff --git a/freetype-2.6.3-pcf-encoding.patch b/freetype-2.6.3-pcf-encoding.patch
new file mode 100644
index 0000000..fd1c706
--- /dev/null
+++ b/freetype-2.6.3-pcf-encoding.patch
@@ -0,0 +1,58 @@
+From 082f2faf5007812bac6a1f783c7dcc6f49d761fe Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl(a)gnu.org>
+Date: Wed, 24 May 2017 07:40:46 +0200
+Subject: [PATCH] [bdf, pcf] Support ISO646.1991-IRV character encoding (aka
+ ASCII).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Marek Kašík <mkasik(a)redhat.com>, cf.
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=1451795
+
+* src/bdf/bdfdrivr.c (BDF_Face_Init), src/pcf/pcfdrivr.c
+(PCF_Face_Init): Implement it.
+---
+ ChangeLog | 11 +++++++++++
+ src/bdf/bdfdrivr.c | 6 +++++-
+ src/pcf/pcfdrivr.c | 6 +++++-
+ 3 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c
+index a2242be0..c0a5a5c5 100644
+--- a/src/bdf/bdfdrivr.c
++++ b/src/bdf/bdfdrivr.c
+@@ -545,7 +545,11 @@ THE SOFTWARE.
+ if ( !ft_strcmp( s, "10646" ) ||
+ ( !ft_strcmp( s, "8859" ) &&
+ !ft_strcmp( face->charset_encoding, "1" ) ) )
+- unicode_charmap = 1;
++ unicode_charmap = 1;
++ /* another name for ASCII */
++ else if ( !ft_strcmp( s, "646.1991" ) &&
++ !ft_strcmp( face->charset_encoding, "IRV" ) )
++ unicode_charmap = 1;
+ }
+
+ {
+diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c
+index 9f4d36d1..50530941 100644
+--- a/src/pcf/pcfdrivr.c
++++ b/src/pcf/pcfdrivr.c
+@@ -387,7 +387,11 @@ THE SOFTWARE.
+ if ( !ft_strcmp( s, "10646" ) ||
+ ( !ft_strcmp( s, "8859" ) &&
+ !ft_strcmp( face->charset_encoding, "1" ) ) )
+- unicode_charmap = 1;
++ unicode_charmap = 1;
++ /* another name for ASCII */
++ else if ( !ft_strcmp( s, "646.1991" ) &&
++ !ft_strcmp( face->charset_encoding, "IRV" ) )
++ unicode_charmap = 1;
+ }
+ }
+
+--
+2.13.0
+
diff --git a/freetype-freeworld.spec b/freetype-freeworld.spec
index 71dfbbd..77e3b4d 100644
--- a/freetype-freeworld.spec
+++ b/freetype-freeworld.spec
@@ -1,15 +1,19 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
Version: 2.6.3
-Release: 3%{?dist}
+Release: 4%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
URL: http://www.freetype.org
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.ta...
-Patch21: freetype-2.3.0-enable-spr.patch
+Patch0: freetype-2.3.0-enable-spr.patch
# Enable otvalid and gxvalid modules
-Patch46: freetype-2.2.1-enable-valid.patch
+Patch1: freetype-2.2.1-enable-valid.patch
+
+# Accept ISO646.1991-IRV as a Unicode charmap in PCF and BDF drivers
+# https://bugzilla.redhat.com/show_bug.cgi?id=1451795
+Patch4: freetype-2.6.3-pcf-encoding.patch
## Security fixes:
# https://bugzilla.redhat.com/show_bug.cgi?id=1429965
@@ -45,9 +49,11 @@ It transparently overrides the system library using ld.so.conf.d.
%prep
%setup -q -n freetype-%{version}
-%patch21 -p1 -b .enable-spr
+%patch0 -p1 -b .enable-spr
+
+%patch1 -p1 -b .enable-valid
-%patch46 -p1 -b .enable-valid
+%patch4 -p1 -b .pcf-encoding
%patch93 -p1 -b .heap-buffer-overflow
@@ -98,6 +104,10 @@ echo "%{_libdir}/%{name}" \
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Sun May 28 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.6.3-4
+- Add freetype-2.6.3-pcf-encoding.patch from Fedora freetype: Accept
+ ISO646.1991-IRV as a Unicode charmap in PCF and BDF drivers (rh#1451795)
+
* Thu May 04 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.6.3-3
- Add freetype-2.6.3-protect-flex-handling.patch from Fedora freetype:
Better protect `flex' handling (CVE-2017-8105, rh#1446501)
6 years, 11 months
[freetype-freeworld/f25] Add freetype-2.6.5-pcf-encoding.patch from Fedora freetype (rh#1451795)
by Kevin Kofler
commit 0d9204294e5b2d532b5b16a81934453d03ad0ca3
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Sun May 28 10:23:16 2017 +0200
Add freetype-2.6.5-pcf-encoding.patch from Fedora freetype (rh#1451795)
* Sun May 28 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.6.5-6
- Add freetype-2.6.5-pcf-encoding.patch from Fedora freetype: Accept
ISO646.1991-IRV as a Unicode charmap in PCF and BDF drivers (rh#1451795)
freetype-2.6.5-pcf-encoding.patch | 58 +++++++++++++++++++++++++++++++++++++++
freetype-freeworld.spec | 20 ++++++++++----
2 files changed, 73 insertions(+), 5 deletions(-)
---
diff --git a/freetype-2.6.5-pcf-encoding.patch b/freetype-2.6.5-pcf-encoding.patch
new file mode 100644
index 0000000..fd1c706
--- /dev/null
+++ b/freetype-2.6.5-pcf-encoding.patch
@@ -0,0 +1,58 @@
+From 082f2faf5007812bac6a1f783c7dcc6f49d761fe Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl(a)gnu.org>
+Date: Wed, 24 May 2017 07:40:46 +0200
+Subject: [PATCH] [bdf, pcf] Support ISO646.1991-IRV character encoding (aka
+ ASCII).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Marek Kašík <mkasik(a)redhat.com>, cf.
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=1451795
+
+* src/bdf/bdfdrivr.c (BDF_Face_Init), src/pcf/pcfdrivr.c
+(PCF_Face_Init): Implement it.
+---
+ ChangeLog | 11 +++++++++++
+ src/bdf/bdfdrivr.c | 6 +++++-
+ src/pcf/pcfdrivr.c | 6 +++++-
+ 3 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c
+index a2242be0..c0a5a5c5 100644
+--- a/src/bdf/bdfdrivr.c
++++ b/src/bdf/bdfdrivr.c
+@@ -545,7 +545,11 @@ THE SOFTWARE.
+ if ( !ft_strcmp( s, "10646" ) ||
+ ( !ft_strcmp( s, "8859" ) &&
+ !ft_strcmp( face->charset_encoding, "1" ) ) )
+- unicode_charmap = 1;
++ unicode_charmap = 1;
++ /* another name for ASCII */
++ else if ( !ft_strcmp( s, "646.1991" ) &&
++ !ft_strcmp( face->charset_encoding, "IRV" ) )
++ unicode_charmap = 1;
+ }
+
+ {
+diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c
+index 9f4d36d1..50530941 100644
+--- a/src/pcf/pcfdrivr.c
++++ b/src/pcf/pcfdrivr.c
+@@ -387,7 +387,11 @@ THE SOFTWARE.
+ if ( !ft_strcmp( s, "10646" ) ||
+ ( !ft_strcmp( s, "8859" ) &&
+ !ft_strcmp( face->charset_encoding, "1" ) ) )
+- unicode_charmap = 1;
++ unicode_charmap = 1;
++ /* another name for ASCII */
++ else if ( !ft_strcmp( s, "646.1991" ) &&
++ !ft_strcmp( face->charset_encoding, "IRV" ) )
++ unicode_charmap = 1;
+ }
+ }
+
+--
+2.13.0
+
diff --git a/freetype-freeworld.spec b/freetype-freeworld.spec
index 30d29d3..b1ef230 100644
--- a/freetype-freeworld.spec
+++ b/freetype-freeworld.spec
@@ -1,15 +1,19 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
Version: 2.6.5
-Release: 5%{?dist}
+Release: 6%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
URL: http://www.freetype.org
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.ta...
-Patch21: freetype-2.3.0-enable-spr.patch
+Patch0: freetype-2.3.0-enable-spr.patch
# Enable otvalid and gxvalid modules
-Patch46: freetype-2.2.1-enable-valid.patch
+Patch1: freetype-2.2.1-enable-valid.patch
+
+# Accept ISO646.1991-IRV as a Unicode charmap in PCF and BDF drivers
+# https://bugzilla.redhat.com/show_bug.cgi?id=1451795
+Patch4: freetype-2.6.5-pcf-encoding.patch
## Security fixes:
# https://bugzilla.redhat.com/show_bug.cgi?id=1429965
@@ -45,9 +49,11 @@ It transparently overrides the system library using ld.so.conf.d.
%prep
%setup -q -n freetype-%{version}
-%patch21 -p1 -b .enable-spr
+%patch0 -p1 -b .enable-spr
+
+%patch1 -p1 -b .enable-valid
-%patch46 -p1 -b .enable-valid
+%patch4 -p1 -b .pcf-encoding
%patch94 -p1 -b .heap-buffer-overflow
%patch95 -p1 -b .protect-flex-handling
@@ -96,6 +102,10 @@ echo "%{_libdir}/%{name}" \
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Sun May 28 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.6.5-6
+- Add freetype-2.6.5-pcf-encoding.patch from Fedora freetype: Accept
+ ISO646.1991-IRV as a Unicode charmap in PCF and BDF drivers (rh#1451795)
+
* Thu May 04 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.6.5-5
- Add freetype-2.6.5-protect-flex-handling.patch from Fedora freetype:
Better protect `flex' handling (CVE-2017-8105, rh#1446501)
6 years, 11 months
[freetype-freeworld/f26] Add freetype-2.7.1-pcf-encoding.patch from Fedora freetype (rh#1451795)
by Kevin Kofler
commit 6e7a59c69115882f147016895e96050999e3f96e
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Sun May 28 10:18:53 2017 +0200
Add freetype-2.7.1-pcf-encoding.patch from Fedora freetype (rh#1451795)
* Sun May 28 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.7.1-6
- Add freetype-2.7.1-pcf-encoding.patch from Fedora freetype: Accept
ISO646.1991-IRV as a Unicode charmap in PCF and BDF drivers (rh#1451795)
freetype-2.7.1-pcf-encoding.patch | 58 +++++++++++++++++++++++++++++++++++++++
freetype-freeworld.spec | 20 ++++++++++----
2 files changed, 73 insertions(+), 5 deletions(-)
---
diff --git a/freetype-2.7.1-pcf-encoding.patch b/freetype-2.7.1-pcf-encoding.patch
new file mode 100644
index 0000000..fd1c706
--- /dev/null
+++ b/freetype-2.7.1-pcf-encoding.patch
@@ -0,0 +1,58 @@
+From 082f2faf5007812bac6a1f783c7dcc6f49d761fe Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl(a)gnu.org>
+Date: Wed, 24 May 2017 07:40:46 +0200
+Subject: [PATCH] [bdf, pcf] Support ISO646.1991-IRV character encoding (aka
+ ASCII).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Marek Kašík <mkasik(a)redhat.com>, cf.
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=1451795
+
+* src/bdf/bdfdrivr.c (BDF_Face_Init), src/pcf/pcfdrivr.c
+(PCF_Face_Init): Implement it.
+---
+ ChangeLog | 11 +++++++++++
+ src/bdf/bdfdrivr.c | 6 +++++-
+ src/pcf/pcfdrivr.c | 6 +++++-
+ 3 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c
+index a2242be0..c0a5a5c5 100644
+--- a/src/bdf/bdfdrivr.c
++++ b/src/bdf/bdfdrivr.c
+@@ -545,7 +545,11 @@ THE SOFTWARE.
+ if ( !ft_strcmp( s, "10646" ) ||
+ ( !ft_strcmp( s, "8859" ) &&
+ !ft_strcmp( face->charset_encoding, "1" ) ) )
+- unicode_charmap = 1;
++ unicode_charmap = 1;
++ /* another name for ASCII */
++ else if ( !ft_strcmp( s, "646.1991" ) &&
++ !ft_strcmp( face->charset_encoding, "IRV" ) )
++ unicode_charmap = 1;
+ }
+
+ {
+diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c
+index 9f4d36d1..50530941 100644
+--- a/src/pcf/pcfdrivr.c
++++ b/src/pcf/pcfdrivr.c
+@@ -387,7 +387,11 @@ THE SOFTWARE.
+ if ( !ft_strcmp( s, "10646" ) ||
+ ( !ft_strcmp( s, "8859" ) &&
+ !ft_strcmp( face->charset_encoding, "1" ) ) )
+- unicode_charmap = 1;
++ unicode_charmap = 1;
++ /* another name for ASCII */
++ else if ( !ft_strcmp( s, "646.1991" ) &&
++ !ft_strcmp( face->charset_encoding, "IRV" ) )
++ unicode_charmap = 1;
+ }
+ }
+
+--
+2.13.0
+
diff --git a/freetype-freeworld.spec b/freetype-freeworld.spec
index ad2237b..805338e 100644
--- a/freetype-freeworld.spec
+++ b/freetype-freeworld.spec
@@ -1,15 +1,19 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
Version: 2.7.1
-Release: 5%{?dist}
+Release: 6%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
URL: http://www.freetype.org
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.ta...
-Patch21: freetype-2.3.0-enable-spr.patch
+Patch0: freetype-2.3.0-enable-spr.patch
# Enable otvalid and gxvalid modules
-Patch46: freetype-2.2.1-enable-valid.patch
+Patch1: freetype-2.2.1-enable-valid.patch
+
+# Accept ISO646.1991-IRV as a Unicode charmap in PCF and BDF drivers
+# https://bugzilla.redhat.com/show_bug.cgi?id=1451795
+Patch4: freetype-2.7.1-pcf-encoding.patch
## Security fixes:
# https://bugzilla.redhat.com/show_bug.cgi?id=1446500
@@ -42,9 +46,11 @@ It transparently overrides the system library using ld.so.conf.d.
%prep
%setup -q -n freetype-%{version}
-%patch21 -p1 -b .enable-spr
+%patch0 -p1 -b .enable-spr
+
+%patch1 -p1 -b .enable-valid
-%patch46 -p1 -b .enable-valid
+%patch4 -p1 -b .pcf-encoding
%patch94 -p1 -b .protect-flex-handling
%patch95 -p1 -b .safety-guard
@@ -91,6 +97,10 @@ echo "%{_libdir}/%{name}" \
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Sun May 28 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.7.1-6
+- Add freetype-2.7.1-pcf-encoding.patch from Fedora freetype: Accept
+ ISO646.1991-IRV as a Unicode charmap in PCF and BDF drivers (rh#1451795)
+
* Thu May 04 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.7.1-5
- Add freetype-2.7.1-protect-flex-handling.patch from Fedora freetype:
Better protect `flex' handling (CVE-2017-8105, rh#1446501)
6 years, 11 months
[freetype-freeworld] Add freetype-2.8-pcf-encoding.patch from Fedora freetype (rh#1451795)
by Kevin Kofler
commit 45fe2a6276ab35cf05e67c6056d1971443a883e5
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Sun May 28 10:11:52 2017 +0200
Add freetype-2.8-pcf-encoding.patch from Fedora freetype (rh#1451795)
* Sun May 28 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.8-2
- Add freetype-2.8-pcf-encoding.patch from Fedora freetype: Accept
ISO646.1991-IRV as a Unicode charmap in PCF and BDF drivers (rh#1451795)
freetype-2.8-pcf-encoding.patch | 58 +++++++++++++++++++++++++++++++++++++++++
freetype-freeworld.spec | 20 ++++++++++----
2 files changed, 73 insertions(+), 5 deletions(-)
---
diff --git a/freetype-2.8-pcf-encoding.patch b/freetype-2.8-pcf-encoding.patch
new file mode 100644
index 0000000..fd1c706
--- /dev/null
+++ b/freetype-2.8-pcf-encoding.patch
@@ -0,0 +1,58 @@
+From 082f2faf5007812bac6a1f783c7dcc6f49d761fe Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl(a)gnu.org>
+Date: Wed, 24 May 2017 07:40:46 +0200
+Subject: [PATCH] [bdf, pcf] Support ISO646.1991-IRV character encoding (aka
+ ASCII).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Marek Kašík <mkasik(a)redhat.com>, cf.
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=1451795
+
+* src/bdf/bdfdrivr.c (BDF_Face_Init), src/pcf/pcfdrivr.c
+(PCF_Face_Init): Implement it.
+---
+ ChangeLog | 11 +++++++++++
+ src/bdf/bdfdrivr.c | 6 +++++-
+ src/pcf/pcfdrivr.c | 6 +++++-
+ 3 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c
+index a2242be0..c0a5a5c5 100644
+--- a/src/bdf/bdfdrivr.c
++++ b/src/bdf/bdfdrivr.c
+@@ -545,7 +545,11 @@ THE SOFTWARE.
+ if ( !ft_strcmp( s, "10646" ) ||
+ ( !ft_strcmp( s, "8859" ) &&
+ !ft_strcmp( face->charset_encoding, "1" ) ) )
+- unicode_charmap = 1;
++ unicode_charmap = 1;
++ /* another name for ASCII */
++ else if ( !ft_strcmp( s, "646.1991" ) &&
++ !ft_strcmp( face->charset_encoding, "IRV" ) )
++ unicode_charmap = 1;
+ }
+
+ {
+diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c
+index 9f4d36d1..50530941 100644
+--- a/src/pcf/pcfdrivr.c
++++ b/src/pcf/pcfdrivr.c
+@@ -387,7 +387,11 @@ THE SOFTWARE.
+ if ( !ft_strcmp( s, "10646" ) ||
+ ( !ft_strcmp( s, "8859" ) &&
+ !ft_strcmp( face->charset_encoding, "1" ) ) )
+- unicode_charmap = 1;
++ unicode_charmap = 1;
++ /* another name for ASCII */
++ else if ( !ft_strcmp( s, "646.1991" ) &&
++ !ft_strcmp( face->charset_encoding, "IRV" ) )
++ unicode_charmap = 1;
+ }
+ }
+
+--
+2.13.0
+
diff --git a/freetype-freeworld.spec b/freetype-freeworld.spec
index 12addd4..a81bf67 100644
--- a/freetype-freeworld.spec
+++ b/freetype-freeworld.spec
@@ -1,15 +1,19 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
Version: 2.8
-Release: 1%{?dist}
+Release: 2%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
URL: http://www.freetype.org
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.ta...
-Patch21: freetype-2.3.0-enable-spr.patch
+Patch0: freetype-2.3.0-enable-spr.patch
# Enable otvalid and gxvalid modules
-Patch46: freetype-2.2.1-enable-valid.patch
+Patch1: freetype-2.2.1-enable-valid.patch
+
+# Accept ISO646.1991-IRV as a Unicode charmap in PCF and BDF drivers
+# https://bugzilla.redhat.com/show_bug.cgi?id=1451795
+Patch4: freetype-2.8-pcf-encoding.patch
## Security fixes:
# None yet
@@ -38,9 +42,11 @@ It transparently overrides the system library using ld.so.conf.d.
%prep
%setup -q -n freetype-%{version}
-%patch21 -p1 -b .enable-spr
+%patch0 -p1 -b .enable-spr
+
+%patch1 -p1 -b .enable-valid
-%patch46 -p1 -b .enable-valid
+%patch4 -p1 -b .pcf-encoding
%build
%configure --disable-static \
@@ -84,6 +90,10 @@ echo "%{_libdir}/%{name}" \
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Sun May 28 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.8-2
+- Add freetype-2.8-pcf-encoding.patch from Fedora freetype: Accept
+ ISO646.1991-IRV as a Unicode charmap in PCF and BDF drivers (rh#1451795)
+
* Sun May 28 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.8-1
- Update to 2.8 (matches Fedora freetype, rh#1450581)
- Drop obsolete backported security patches
6 years, 11 months