mirror of
https://abf.rosa.ru/djam/samba.git
synced 2025-02-23 17:12:48 +00:00
Fix and build translations of pam_winbind
This commit is contained in:
Mikhail Novosyolov
parent
9ee50cb15b
commit
4276e247e5
6 changed files with 12800 additions and 3 deletions
29
0001-s3-fix-running-genmsg-in-pure-git.patch
Normal file
29
0001-s3-fix-running-genmsg-in-pure-git.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
From f63e518c94336f6558205ba486ceb199d41f0104 Mon Sep 17 00:00:00 2001
|
||||
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
||||
Date: Tue, 15 Sep 2020 01:54:05 +0300
|
||||
Subject: [PATCH 1/5] s3: fix running genmsg in pure git
|
||||
|
||||
xgettext wants pam_winbind.po to exist.
|
||||
Without this running ./genmsg in cloned git fails.
|
||||
|
||||
Signed-off-by: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
||||
---
|
||||
source3/locale/pam_winbind/genmsg | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/source3/locale/pam_winbind/genmsg b/source3/locale/pam_winbind/genmsg
|
||||
index ea31b0c5d04..442ec9cd509 100755
|
||||
--- a/source3/locale/pam_winbind/genmsg
|
||||
+++ b/source3/locale/pam_winbind/genmsg
|
||||
@@ -8,6 +8,8 @@ MSGMERGE=msgmerge
|
||||
|
||||
WIDTH=256
|
||||
|
||||
+[ -f pam_winbind.po ] || touch pam_winbind.po
|
||||
+
|
||||
$XGETTEXT --default-domain="pam_winbind" \
|
||||
--add-comments \
|
||||
--keyword=_ --keyword=N_ \
|
||||
--
|
||||
2.25.1
|
||||
|
||||
25
0002-s3-update-paths-in-genmsg-of-pam_winbind.patch
Normal file
25
0002-s3-update-paths-in-genmsg-of-pam_winbind.patch
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
From c9005269ed2bae384ae17f30fa9ace394f591023 Mon Sep 17 00:00:00 2001
|
||||
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
||||
Date: Tue, 15 Sep 2020 01:58:37 +0300
|
||||
Subject: [PATCH 2/5] s3: update paths in genmsg of pam_winbind
|
||||
|
||||
Signed-off-by: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
||||
---
|
||||
source3/locale/pam_winbind/genmsg | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/source3/locale/pam_winbind/genmsg b/source3/locale/pam_winbind/genmsg
|
||||
index 442ec9cd509..04836f54440 100755
|
||||
--- a/source3/locale/pam_winbind/genmsg
|
||||
+++ b/source3/locale/pam_winbind/genmsg
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
-FILES="../../../nsswitch/pam_winbind.c ../../../nsswitch/pam_winbind.h ../../libsmb/nterr.c"
|
||||
+FILES="../../../nsswitch/pam_winbind.c ../../../nsswitch/pam_winbind.h ../../../libcli/util/nterr.c"
|
||||
LANGS="af ar bg bn bs ca cs cy da de el en_GB en_US es et fi fr gl gu he hi hr hu id it ja ka km ko lo lt mk mr nb nl pa pl pt_BR pt ro ru si sk sl sr sv ta th tr uk vi wa xh zh_CN zh_TW zu"
|
||||
|
||||
XGETTEXT=xgettext
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
From cdd1479cf275e8bea2078c872f079e884468370d Mon Sep 17 00:00:00 2001
|
||||
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
||||
Date: Tue, 15 Sep 2020 02:05:38 +0300
|
||||
Subject: [PATCH 3/5] s3: update list of languages in genmsg of pam_winbind
|
||||
|
||||
Removed languages for which translations do not exist.
|
||||
|
||||
Signed-off-by: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
||||
---
|
||||
source3/locale/pam_winbind/genmsg | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/source3/locale/pam_winbind/genmsg b/source3/locale/pam_winbind/genmsg
|
||||
index 04836f54440..29fa9cb13c7 100755
|
||||
--- a/source3/locale/pam_winbind/genmsg
|
||||
+++ b/source3/locale/pam_winbind/genmsg
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
|
||||
FILES="../../../nsswitch/pam_winbind.c ../../../nsswitch/pam_winbind.h ../../../libcli/util/nterr.c"
|
||||
-LANGS="af ar bg bn bs ca cs cy da de el en_GB en_US es et fi fr gl gu he hi hr hu id it ja ka km ko lo lt mk mr nb nl pa pl pt_BR pt ro ru si sk sl sr sv ta th tr uk vi wa xh zh_CN zh_TW zu"
|
||||
+LANGS="ar cs da de es fi fr hu it ja ko nb nl pl pt_BR ru sv tr zh_CN zh_TW"
|
||||
|
||||
XGETTEXT=xgettext
|
||||
MSGMERGE=msgmerge
|
||||
--
|
||||
2.25.1
|
||||
|
||||
12599
0004-s3-Rerun-genmsg-to-update-pam_winbind-after-10-years.patch
Normal file
12599
0004-s3-Rerun-genmsg-to-update-pam_winbind-after-10-years.patch
Normal file
File diff suppressed because it is too large
Load diff
95
0005-s3-update-Russian-translation-of-pam_winbind.patch
Normal file
95
0005-s3-update-Russian-translation-of-pam_winbind.patch
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
From 9075f6638528083bac46a3f9e700ac827ee0220d Mon Sep 17 00:00:00 2001
|
||||
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
||||
Date: Tue, 15 Sep 2020 02:27:51 +0300
|
||||
Subject: [PATCH 5/5] s3: update Russian translation of pam_winbind
|
||||
|
||||
Signed-off-by: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
||||
---
|
||||
source3/locale/pam_winbind/ru.po | 24 ++++++++++++------------
|
||||
1 file changed, 12 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/source3/locale/pam_winbind/ru.po b/source3/locale/pam_winbind/ru.po
|
||||
index 761dcd13c7b..0338db9bbaa 100644
|
||||
--- a/source3/locale/pam_winbind/ru.po
|
||||
+++ b/source3/locale/pam_winbind/ru.po
|
||||
@@ -5,9 +5,9 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: pam_winbind\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2020-09-15 02:10+0300\n"
|
||||
+"POT-Creation-Date: 2020-09-15 02:26+0300\n"
|
||||
"PO-Revision-Date: 2009-02-05 08:14\n"
|
||||
-"Last-Translator: Novell Language <language@novell.com>\n"
|
||||
+"Last-Translator: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>\n"
|
||||
"Language-Team: Novell Language <language@novell.com>\n"
|
||||
"Language: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@@ -79,19 +79,17 @@ msgid "Access is denied"
|
||||
msgstr "Доступ запрещён"
|
||||
|
||||
#: ../../../nsswitch/pam_winbind.c:882
|
||||
-#, fuzzy
|
||||
msgid "Do you want to change your password now?"
|
||||
-msgstr "Вам необходимо изменить Ваш пароль сейчас"
|
||||
+msgstr "Хотите изменить свой пароль сейчас?"
|
||||
|
||||
#: ../../../nsswitch/pam_winbind.c:963
|
||||
-#, fuzzy
|
||||
msgid "Your password expires today.\n"
|
||||
-msgstr "Срок действия Вашего пароля истёк"
|
||||
+msgstr "Срок действия Вашего пароля истекает сегодня.\n"
|
||||
|
||||
#: ../../../nsswitch/pam_winbind.c:993
|
||||
-#, fuzzy, c-format
|
||||
+#, c-format
|
||||
msgid "Your password will expire in %d %s.\n"
|
||||
-msgstr "Срок действия Вашего пароля истёк"
|
||||
+msgstr "Срок действия Вашего пароля истечет через %d %s.\n"
|
||||
|
||||
#: ../../../nsswitch/pam_winbind.c:994
|
||||
msgid "days"
|
||||
@@ -104,7 +102,7 @@ msgstr "День"
|
||||
#: ../../../nsswitch/pam_winbind.c:1201 ../../../nsswitch/pam_winbind.c:1225
|
||||
#, c-format
|
||||
msgid "Cannot convert group %s to sid, please contact your administrator to see if group %s is valid."
|
||||
-msgstr ""
|
||||
+msgstr "Невозможно конвертировать группу %s в sid, пожалуйста, свяжитесь со своим администратором, чтобы проверить, верна ли группа %s."
|
||||
|
||||
#: ../../../nsswitch/pam_winbind.c:1428
|
||||
msgid "Grace login. Please change your password as soon you're online again"
|
||||
@@ -119,6 +117,8 @@ msgid ""
|
||||
"Failed to establish your Kerberos Ticket cache due time differences\n"
|
||||
"with the domain controller. Please verify the system time.\n"
|
||||
msgstr ""
|
||||
+"Не удалось создать кеш билетов Kerberos из-за разницы во времени\n"
|
||||
+"с контроллером домена. Пожалуйста, проверьте системное время.\n"
|
||||
|
||||
#: ../../../nsswitch/pam_winbind.c:1531
|
||||
msgid "Your password "
|
||||
@@ -145,7 +145,7 @@ msgstr "Пожалуйста, введите другой пароль. Введ
|
||||
#: ../../../nsswitch/pam_winbind.c:1603
|
||||
#, c-format
|
||||
msgid "Creating directory: %s failed: %s"
|
||||
-msgstr ""
|
||||
+msgstr "Ошибка создания директории %s: %s"
|
||||
|
||||
#: ../../../nsswitch/pam_winbind.c:2066
|
||||
msgid "Password does not meet complexity requirements"
|
||||
@@ -156,7 +156,7 @@ msgstr "Пароль не соответствует требованиям сл
|
||||
#.
|
||||
#: ../../../nsswitch/pam_winbind.c:2552 ../../../nsswitch/pam_winbind.c:3177
|
||||
msgid "Username: "
|
||||
-msgstr ""
|
||||
+msgstr "Имя пользователя: "
|
||||
|
||||
#: ../../../nsswitch/pam_winbind.c:2803
|
||||
msgid "Password: "
|
||||
@@ -185,4 +185,4 @@ msgstr "Повторите новый пароль NT: "
|
||||
#.
|
||||
#: ../../../nsswitch/pam_winbind.h:174
|
||||
msgid "Sorry, passwords do not match"
|
||||
-msgstr ""
|
||||
+msgstr "Извините, пароли не совпадают"
|
||||
--
|
||||
2.25.1
|
||||
|
||||
27
samba.spec
27
samba.spec
|
|
@ -99,7 +99,7 @@
|
|||
Summary: Samba SMB server
|
||||
Name: samba
|
||||
Version: 4.12.6
|
||||
Release: 1
|
||||
Release: 2
|
||||
Epoch: 1
|
||||
License: GPLv3+
|
||||
Group: System/Servers
|
||||
|
|
@ -131,6 +131,14 @@ Patch12: ROSA-Clearer-debug-about-ulimits.patch
|
|||
Patch14: 0001-samba-tool-dbcheck-Avoid-creating-child-DNs-via-ldb.patch
|
||||
Patch15: 0002-samba-tool-dbcheck-Avoid-creating-an-RDN-via-ldb.Dn-.patch
|
||||
|
||||
# Localization of pam_winbind
|
||||
# https://gitlab.com/samba-team/samba/-/merge_requests/1574
|
||||
Patch21: 0001-s3-fix-running-genmsg-in-pure-git.patch
|
||||
Patch22: 0002-s3-update-paths-in-genmsg-of-pam_winbind.patch
|
||||
Patch23: 0003-s3-update-list-of-languages-in-genmsg-of-pam_winbind.patch
|
||||
Patch24: 0004-s3-Rerun-genmsg-to-update-pam_winbind-after-10-years.patch
|
||||
Patch25: 0005-s3-update-Russian-translation-of-pam_winbind.patch
|
||||
|
||||
%if %{with clang}
|
||||
BuildRequires: clang lld
|
||||
%else
|
||||
|
|
@ -742,7 +750,7 @@ Conflicts: %{libsambaserver} < 1:4.1.17
|
|||
%description -n %{libwinbind}
|
||||
Provides libraries for winbind daemon and testing tools
|
||||
|
||||
%files -n %{libwinbind}
|
||||
%files -n %{libwinbind} -f pam_winbind.lang
|
||||
%attr(755,root,root) /%{_lib}/security/pam_winbind*
|
||||
/%{_lib}/libnss_winbind*
|
||||
|
||||
|
|
@ -1340,7 +1348,7 @@ fi
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%apply_patches
|
||||
%autopatch -p1
|
||||
grep -q '@ROSA_VENDOR_PATCH@' VERSION # validate
|
||||
# SAMBA_VERSION_VENDOR_PATCH is a floating constant
|
||||
sed -e 's/@ROSA_VENDOR_PATCH@/%{release}/g' -i VERSION
|
||||
|
|
@ -1556,6 +1564,19 @@ sed -i -e 's,@SAMBA_VERSION@,%{version},g' -e 's,@ROSA_VERSION@,%{rosa_release},
|
|||
%{buildroot}%{_sysconfdir}/avahi/services/smb.service
|
||||
%endif
|
||||
|
||||
# Manually build localizations of pam_winbind
|
||||
# https://bugzilla.samba.org/show_bug.cgi?id=14491
|
||||
( cd source3/locale/pam_winbind
|
||||
for i in *.po
|
||||
do
|
||||
# ru.po -> ru
|
||||
lang="$(echo "$i" | awk -F '.' '{print $1}')"
|
||||
mkdir -p %{buildroot}%{_datadir}/locale/${lang}/LC_MESSAGES/
|
||||
msgfmt --output-file=%{buildroot}%{_datadir}/locale/${lang}/LC_MESSAGES/pam_winbind.mo ${i}
|
||||
done
|
||||
)
|
||||
%find_lang pam_winbind
|
||||
|
||||
# /usr/share/spec-helper/relink_symlinks breaks this symlink: an absolute symlink was
|
||||
# created inside %%install, but then relink_symlinks converted it to a relative one.
|
||||
# /usr/lib64/cups is a symlink to /usr/lib/cups, for some reasons this or sth else breaks
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue