From eddef7302b6d74c3e3e211e0ea595556e7e62a99 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Mon, 20 Dec 2021 09:38:46 +0900 Subject: [PATCH] Bump to kbd 2.2.0 Change-Id: Ib38bca8160b5944a12041bf02a938b10f41365a1 --- packaging/Add_pie_compile_option.patch | 137 +++++++++++++++++++++++++++++ packaging/fr-dvorak.tar.bz2 | Bin 0 -> 1530 bytes packaging/kbd-latarcyrheb-16-fixed.tar.bz2 | Bin 0 -> 4291 bytes packaging/kbd-latarcyrheb-32.tar.bz2 | Bin 0 -> 4715 bytes packaging/kbd-latsun-fonts.tar.bz2 | Bin 0 -> 6155 bytes packaging/kbd.manifest | 5 ++ packaging/kbd.spec | 120 +++++++++++++++++++++++++ 7 files changed, 262 insertions(+) create mode 100644 packaging/Add_pie_compile_option.patch create mode 100644 packaging/fr-dvorak.tar.bz2 create mode 100644 packaging/kbd-latarcyrheb-16-fixed.tar.bz2 create mode 100644 packaging/kbd-latarcyrheb-32.tar.bz2 create mode 100644 packaging/kbd-latsun-fonts.tar.bz2 create mode 100644 packaging/kbd.manifest create mode 100644 packaging/kbd.spec diff --git a/packaging/Add_pie_compile_option.patch b/packaging/Add_pie_compile_option.patch new file mode 100644 index 0000000..2aecdd4 --- /dev/null +++ b/packaging/Add_pie_compile_option.patch @@ -0,0 +1,137 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index cd99d2d..0b29004 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -47,12 +47,15 @@ libfont_a_SOURCES = \ + loadunimap.c loadunimap.h \ + kdfontop.c kdfontop.h + ++libfont_a_CFLAGS = -fPIC ++ + ALL_S = paths.h + + chvt_SOURCES = $(ALL_S) chvt.c + clrunimap_SOURCES = $(ALL_S) clrunimap.c + deallocvt_SOURCES = $(ALL_S) deallocvt.c + fgconsole_SOURCES = $(ALL_S) fgconsole.c ++kbdrate_SOURCES = kbdrate.c + getkeycodes_SOURCES = $(ALL_S) getkeycodes.c + getunimap_SOURCES = $(ALL_S) getunimap.c + kbd_mode_SOURCES = $(ALL_S) kbd_mode.c +@@ -75,10 +78,66 @@ kbdinfo_SOURCES = $(ALL_S) kbdinfo.c + dumpkeys_SOURCES = $(ALL_S) dumpkeys.c + loadkeys_SOURCES = $(ALL_S) loadkeys.c + +-mapscrn_CFLAGS = -DMAIN +-loadunimap_CFLAGS = -DMAIN ++mapscrn_CFLAGS = -DMAIN -fPIC ++loadunimap_CFLAGS = -DMAIN -fPIC ++dumpkeys_CFLAGS = -fPIC ++loadkeys_CFLAGS = -fPIC ++showkey_CFLAGS = -fPIC ++setfont_CFLAGS = -fPIC ++showconsolefont_CFLAGS = -fPIC ++setleds_CFLAGS = -fPIC ++setmetamode_CFLAGS = -fPIC ++kbd_mode_CFLAGS = -fPIC ++psfxtable_CFLAGS = -fPIC ++fgconsole_CFLAGS = -fPIC ++kbdrate_CFLAGS = -fPIC ++chvt_CFLAGS = -fPIC ++deallocvt_CFLAGS = -fPIC ++openvt_CFLAGS = -fPIC ++kbdinfo_CFLAGS = -fPIC ++setvtrgb_CFLAGS = -fPIC ++getkeycodes_CFLAGS = -fPIC ++setkeycodes_CFLAGS = -fPIC ++resizecons_CFLAGS = -fPIC ++setlogcons_CFLAGS = -fPIC ++setvesablank_CFLAGS = -fPIC ++getunimap_CFLAGS = -fPIC ++clrunimap_CFLAGS = -fPIC ++setpalette_CFLAGS = -fPIC ++screendump_CFLAGS = -fPIC ++ ++mapscrn_LDFLAGS = -pie ++loadunimap_LDFLAGS = -pie ++dumpkeys_LDFLAGS = -pie ++loadkeys_LDFLAGS = -pie ++showkey_LDFLAGS = -pie ++setfont_LDFLAGS = -pie ++showconsolefont_LDFLAGS = -pie ++setleds_LDFLAGS = -pie ++setmetamode_LDFLAGS = -pie ++kbd_mode_LDFLAGS = -pie ++psfxtable_LDFLAGS = -pie ++fgconsole_LDFLAGS = -pie ++kbdrate_LDFLAGS = -pie ++chvt_LDFLAGS = -pie ++deallocvt_LDFLAGS = -pie ++openvt_LDFLAGS = -pie ++kbdinfo_LDFLAGS = -pie ++ebdinfo_LDFLAGS = -pie ++setvtrgb_LDFLAGS = -pie ++getkeycodes_LDFLAGS = -pie ++setkeycodes_LDFLAGS = -pie ++resizecons_LDFLAGS = -pie ++setlogcons_LDFLAGS = -pie ++setvesablank_LDFLAGS = -pie ++getunimap_LDFLAGS = -pie ++clrunimap_LDFLAGS = -pie ++setpalette_LDFLAGS = -pie ++screendump_LDFLAGS = -pie ++ + + noinst_LIBRARIES = libfont.a ++noinst_CFLAGS = -fPIC + LDADD = \ + libfont.a \ + libkeymap/libkeymap.la \ +diff --git a/src/libcommon/Makefile.am b/src/libcommon/Makefile.am +index 25553a7..4c6a489 100644 +--- a/src/libcommon/Makefile.am ++++ b/src/libcommon/Makefile.am +@@ -8,4 +8,6 @@ libcommon_a_SOURCES = \ + xmalloc.c \ + libcommon.h + ++libcommon_a_CFLAGS = -fPIC ++ + noinst_LIBRARIES = libcommon.a +diff --git a/src/libkbdfile/Makefile.am b/src/libkbdfile/Makefile.am +index 247f128..65f703d 100644 +--- a/src/libkbdfile/Makefile.am ++++ b/src/libkbdfile/Makefile.am +@@ -20,6 +20,8 @@ libkbdfile_la_SOURCES = \ + init.c \ + kbdfile.c + ++libkbdfile_la_CFLAGS = -fPIC ++ + KBDFILE_CURRENT = 1 + KBDFILE_REVISION = 0 + KBDFILE_AGE = 0 +diff --git a/src/libkeymap/Makefile.am b/src/libkeymap/Makefile.am +index b6a99e2..11bb3bf 100644 +--- a/src/libkeymap/Makefile.am ++++ b/src/libkeymap/Makefile.am +@@ -62,6 +62,7 @@ libkeymap_la_SOURCES = \ + ksyms.c ksyms.h $(ksyms_headers) \ + $(srcdir)/../paths.h + ++libkeymap_la_CFLAGS = -fPIC + libkeymap_la_LIBADD = $(builddir)/../libkbdfile/libkbdfile.la + + if BUILD_LIBKEYMAP +diff --git a/src/vlock/Makefile.am b/src/vlock/Makefile.am +index 49ce5b6..cdff372 100644 +--- a/src/vlock/Makefile.am ++++ b/src/vlock/Makefile.am +@@ -19,5 +19,7 @@ vlock_SOURCES = \ + vlock.c \ + vlock.h \ + vt.c ++vlock_CFLAGS = -fPIC ++vlock_LDFLAGS = -pie + + vlock_LDADD = $(top_builddir)/src/libcommon/libcommon.a @PAM_LIBS@ diff --git a/packaging/fr-dvorak.tar.bz2 b/packaging/fr-dvorak.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..1067c6c8e5bb0b3b81076172ec8504b0b311ded1 GIT binary patch literal 1530 zcmVCop|L_0^5C8xOPzBy= zrPgZA8 zCM57g(A0V+H8j&8JwRwQ(0YwMPbvAM-J~^b38T3IlBfi3vXG!lX4v07`GTn{L~0XB z4j7XLBzb+h{fE1(@Oc^iOFa+P1929}mbXQ~7R@*huXAA`@`=_Er5NTFVX~40(E!|S? zv{vjWn#twok5#a>jP$Z*9MZE#6pIrvT?;#t8uR4AP`iC<%&~DR2a?ZLe3lV7IQG3u z)(GunEIrwE^y|$xcPzE!Oh)HzK6E$qY## zk|4X$sS1eBqsoO^&{f^$kryz4q`^>t=K`pKnyVF-VlHTEf~XXct|+ebXtlC3aZFy} z178@wLnP#SO{@W%1V~t|D~>?WnMEb(0p|umR}Sr$h$N=3DpKOj!p$Fj2yNtl>4XVN zhhrLUD3?xHH*rKXcE#lzy5d+LnU-|no-Y+WKYL1)k4lk1P=OsS1H|7e(={an>b;0p zLYgwQNg%m-1?#q zqfm&SDF!90{p5h%Fp!$Dbug;w)Iyk$9O4w^WxJQ4rptr!v#y5~dgZiZR}r@o-iM+FBg zGd+=b=NU&nVMXN7@zfL|iwpEc20gY}$0Z`+ zt!$nHWr@a#yix;#hK6CHaRwEUWMg<}^og``nN=P@0nt9dLG%uhu%2eJ` zYb!7^;{G~oxZ}L&-N%y_QXs&_({N)Y!IiUJY4zkNrQ5=1d-$b=U`8mGd9ZuzEY5_M zpovn)DCUr5dZLcvtONO7AOcw zQVz;(hH@GAT>~4K0wl7YE?}h*Vwt(9+E`fIrI&WN(WJfzzS8}IH@^vl<73j~jjYV~ z6|lA4N+@ZOepuM}u9j&nOsZqEL=S!$T;rHVwp?Jys_HswGxoK&tnm=DX+T}1-HL;r zy_2^jrtZxIoZzdi&e$IXu*yOnlsW{N%_2q(H6elmN!ahUnjT$-Of4aqaRpm4M&z%0 zg?;UvO8m0gUt6)9vM|+d1kH7{zSrD{Dah!cr1Sbw+K%ZOpUE6$PhXrP5VELWGl7+< g$n|C6rwzU8hyrF#S_hS<)HbHDf?bRx^+uAEA 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 h;rBOfrF{ffLT_;+MiJzPPaJ(N%jM*24#7uX&( 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 TTrgs`9 literal 0 HcmV?d00001 diff --git a/packaging/kbd.manifest b/packaging/kbd.manifest new file mode 100644 index 0000000..017d22d --- /dev/null +++ b/packaging/kbd.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/kbd.spec b/packaging/kbd.spec new file mode 100644 index 0000000..6e80878 --- /dev/null +++ b/packaging/kbd.spec @@ -0,0 +1,120 @@ +Name: kbd +Version: 2.2.0 +Release: 0 +Summary: Tools for configuring the console (keyboard, virtual terminals, etc + +License: GPL-2.0+ +Url: http://ftp.altlinux.org/pub/people/legion/kbd +Group: Base/Utilities +Source0: %{name}-%{version}.tar.bz2 +Source2: kbd-latsun-fonts.tar.bz2 +Source3: kbd-latarcyrheb-16-fixed.tar.bz2 +Source4: fr-dvorak.tar.bz2 +Source5: kbd-latarcyrheb-32.tar.bz2 +Source6: Add_pie_compile_option.patch +Source1001: kbd.manifest + +BuildRequires: bison +BuildRequires: flex +BuildRequires: gettext +BuildRequires: pkgconfig(check) +BuildRequires: pam-devel +BuildRequires: fdupes +Requires: %{name}-misc = %{version} + +%description +The %{name} package contains tools for managing a Linux +system's console's behavior, including the keyboard, the screen +fonts, the virtual terminals and font files. + +%package misc +Summary: Data for kbd package +BuildArch: noarch + +%description misc +The %{name}-misc package contains data for kbd package - console fonts, +keymaps etc. Please note that %{name}-misc is not helpful without kbd. + +%prep +%setup -q -a 2 -a 3 -a 4 -a 5 +cp %{SOURCE1001} . +%{__patch} -p1 < %{SOURCE6} + +# 7-bit maps are obsolete; so are non-euro maps +pushd data/keymaps/i386 +mv qwerty/fi.map qwerty/fi-old.map +#cp qwerty/fi-latin9.map qwerty/fi.map +cp qwerty/pt-latin9.map qwerty/pt.map +cp qwerty/sv-latin1.map qwerty/se-latin1.map + +mv azerty/fr.map azerty/fr-old.map +cp azerty/fr-latin9.map azerty/fr.map + +cp azerty/fr-latin9.map azerty/fr-latin0.map # legacy alias + +# Rename conflicting keymaps +mv fgGIod/trf.map fgGIod/trf-fgGIod.map +mv olpc/es.map olpc/es-olpc.map +mv olpc/pt.map olpc/pt-olpc.map +mv qwerty/cz.map qwerty/cz-qwerty.map +popd + +# remove obsolete "gr" translation +pushd po +rm -f gr.po gr.gmo +popd + +%build +%if "%{asan}" == "1" +%restore_fcommon +%endif + +autoreconf -fi +%configure --prefix=%{_prefix} \ + --datadir=%{_prefix}/lib/kbd \ + --mandir=%{_mandir} \ + --localedir=%{_datadir}/locale \ + --disable-nls + +%__make %{?_smp_mflags} + +%install +%make_install + +# ro_win.map.gz is useless +rm -f %{buildroot}/%{_prefix}/lib/kbd/keymaps/i386/qwerty/ro_win.map.gz + +# Create additional name for Serbian latin keyboard +ln -sf sr-cy.map.gz %{buildroot}/%{_prefix}/lib/kbd/keymaps/i386/qwerty/sr-latin.map.gz + +# The rhpl keyboard layout table is indexed by kbd layout names, so we need a +# Korean keyboard +ln -sf us.map.gz %{buildroot}/%{_prefix}/lib/kbd/keymaps/i386/qwerty/ko.map.gz + +# Some microoptimization +sed -i -e 's,\,/usr/bin/kbd_mode,g;s,\,/usr/bin/setfont,g' \ + %{buildroot}/%{_bindir}/unicode_start + +# Link open to openvt +ln -sf openvt %{buildroot}%{_bindir}/open + +## Move locale files to correct place +#cp -r %%{buildroot}/lib/kbd/locale/ %%{buildroot}%%{_datadir}/locale +#rm -rf %%{buildroot}/lib/kbd/locale + +%fdupes %{buildroot}%{_prefix}/lib/kbd + +%docs_package + +%check +# %__make check || exit 0 + + +%files +%manifest %{name}.manifest +%license COPYING +%{_bindir}/* + +%files misc +%manifest %{name}.manifest +%{_prefix}/lib/kbd -- 2.7.4