summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCallum Parsey2023-07-02 11:41:52 +0930
committerCallum Parsey2023-07-02 11:41:52 +0930
commit1ba4ed7aa73865f53c98afaccc646026c7e2ba46 (patch)
treed10d345bf907dc84756b3a41b55b5d8efa0a6222
parent1801a446957e8be98c6b20ae8e7426fc3e4767c2 (diff)
downloadaur-1ba4ed7aa73865f53c98afaccc646026c7e2ba46.tar.gz
Update to upstream version 3.137
I skipped 3.133 and 3.134 because those only changed the Debian packaging scripts, which are not used on Arch Linux. 3.135, 3.136 and 3.137 were all released within a few hours of each other, and things seem to have stabilised now.
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD27
-rw-r--r--arch-finger.patch8
-rw-r--r--arch-license-path.patch294
-rw-r--r--arch-policy.patch44
5 files changed, 193 insertions, 192 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b6b1c48a1c3d..1531e48d7079 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = adduser-deb
pkgdesc = Debian's 'adduser' and 'deluser' commands for creating and removing users
- pkgver = 3.132
+ pkgver = 3.137
pkgrel = 1
url = https://salsa.debian.org/debian/adduser
arch = any
@@ -16,13 +16,13 @@ pkgbase = adduser-deb
conflicts = adduser
backup = etc/adduser.conf
backup = etc/deluser.conf
- source = https://salsa.debian.org/debian/adduser/-/archive/debian/3.132/adduser-debian-3.132.tar.gz
+ source = https://salsa.debian.org/debian/adduser/-/archive/debian/3.137/adduser-debian-3.137.tar.gz
source = arch-finger.patch
source = arch-license-path.patch
source = arch-policy.patch
- sha256sums = dfeb96647b7f4e84eb26f78ae60da1a64b2d8f0071bbf9ba00c513db20a1bcef
- sha256sums = 0acd60ff4efb100b3f15042c3d31c447a387140240d72b81be25b6afdf952e02
- sha256sums = 7c6bbbb2cd59127b698977db8a9ffbe77815b4e1e2761f353a7946516147129e
- sha256sums = 320d34f3e08a4546c1737370c17c091810a364ab184638fbcf2759fef8e0a1ea
+ sha256sums = 28cdbd0b393a7ce2eb018caaf8dc1c0917d0937720372dc2d2cedbf0e4d2e9c1
+ sha256sums = a65b9919007d55fd5ace456276493e78a6cd2183d1277c458c74879cc2519e81
+ sha256sums = 24329842e91bf863621eccb8abebcf2419019a572ea33dc61e85a8ad0b929545
+ sha256sums = e427698b1ff381bc5c6b1a696e28fdfc4aa9ffbb6a8124a4d612ded31b30e9ef
pkgname = adduser-deb
diff --git a/PKGBUILD b/PKGBUILD
index 358f2c088482..a414c0c06c6a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
# `conflicts` directives. Neither scenario is ideal, so just use the old name.
pkgname=adduser-deb
_pkgname=adduser-debian
-pkgver=3.132
+pkgver=3.137
pkgrel=1
pkgdesc="Debian's 'adduser' and 'deluser' commands for creating and removing users"
arch=("any")
@@ -43,10 +43,10 @@ source=("https://salsa.debian.org/debian/adduser/-/archive/debian/${pkgver}/${_p
"arch-finger.patch"
"arch-license-path.patch"
"arch-policy.patch")
-sha256sums=('dfeb96647b7f4e84eb26f78ae60da1a64b2d8f0071bbf9ba00c513db20a1bcef'
- '0acd60ff4efb100b3f15042c3d31c447a387140240d72b81be25b6afdf952e02'
- '7c6bbbb2cd59127b698977db8a9ffbe77815b4e1e2761f353a7946516147129e'
- '320d34f3e08a4546c1737370c17c091810a364ab184638fbcf2759fef8e0a1ea')
+sha256sums=('28cdbd0b393a7ce2eb018caaf8dc1c0917d0937720372dc2d2cedbf0e4d2e9c1'
+ 'a65b9919007d55fd5ace456276493e78a6cd2183d1277c458c74879cc2519e81'
+ '24329842e91bf863621eccb8abebcf2419019a572ea33dc61e85a8ad0b929545'
+ 'e427698b1ff381bc5c6b1a696e28fdfc4aa9ffbb6a8124a4d612ded31b30e9ef')
prepare() {
# Arch's UID/GID policy differs a little from Debian's. I've included a patch
@@ -78,7 +78,7 @@ prepare() {
# to make this customisable by the packager would be a good idea.
patch -Np0 -d . -i arch-license-path.patch
cd ${_pkgname}-${pkgver}
- sed -i "s/my \$version = \"VERSION\"/my \$version = \"${pkgver}-arch${pkgrel}\"/" adduser deluser
+ sed -i "s/my \$version = \"DVERSION\"/my \$version = \"${pkgver}-arch${pkgrel}\"/" {add,del}user
cd ..
# On Arch, `chfn` comes from the `util-linux` package rather than `shadow`.
@@ -151,21 +151,22 @@ build() {
package() {
cd ${_pkgname}-${pkgver}
- # Binaries
- install -Dm755 adduser "${pkgdir}/usr/bin/adduser"
- install -Dm755 deluser "${pkgdir}/usr/bin/deluser"
- install -Dm755 AdduserCommon.pm "${pkgdir}/usr/share/perl5/vendor_perl/Debian/AdduserCommon.pm"
+ # Binaries and helper scripts
+ install -d "${pkgdir}/usr/bin" "${pkgdir}/usr/share/perl5/vendor_perl/Debian"
+ install -m755 {add,del}user "${pkgdir}/usr/bin"
+ install -m755 Adduser{Common,Logging,Retvalues}.pm \
+ "${pkgdir}/usr/share/perl5/vendor_perl/Debian"
ln -s adduser "${pkgdir}/usr/bin/addgroup"
ln -s deluser "${pkgdir}/usr/bin/delgroup"
# Configuration files
- install -Dm644 adduser.conf "${pkgdir}/etc/adduser.conf"
- install -Dm644 deluser.conf "${pkgdir}/etc/deluser.conf"
+ install -d "${pkgdir}/etc"
+ install -m644 {add,del}user.conf "${pkgdir}/etc"
# Documentation
cd debian
install -d "${pkgdir}/usr/share/doc/adduser"
- install -Dm644 copyright NEWS README "${pkgdir}/usr/share/doc/adduser"
+ install -m644 copyright NEWS README "${pkgdir}/usr/share/doc/adduser"
# Manpages
# This is more than a mouthful, so let's work through it step-by-step.
diff --git a/arch-finger.patch b/arch-finger.patch
index 6c3747da8d1c..c0652b395174 100644
--- a/arch-finger.patch
+++ b/arch-finger.patch
@@ -1,7 +1,7 @@
-diff '--color=auto' -rupN adduser-debian-3.132.orig/adduser adduser-debian-3.132/adduser
---- adduser-debian-3.132.orig/adduser 2023-03-07 20:17:55.743091131 +1030
-+++ adduser-debian-3.132/adduser 2023-03-07 20:19:16.165702456 +1030
-@@ -1185,16 +1185,14 @@ sub ch_comment {
+diff '--color=auto' -rupN adduser-debian-3.137.orig/adduser adduser-debian-3.137/adduser
+--- adduser-debian-3.137.orig/adduser 2023-07-02 10:45:48.007039732 +0930
++++ adduser-debian-3.137/adduser 2023-07-02 10:46:01.457448798 +0930
+@@ -1296,16 +1296,14 @@ sub ch_comment {
my $chfn = &which('chfn');
my $comment = shift;
if($comment =~ /,/) {
diff --git a/arch-license-path.patch b/arch-license-path.patch
index d18caa4038a8..84c84d4b852f 100644
--- a/arch-license-path.patch
+++ b/arch-license-path.patch
@@ -1,33 +1,33 @@
-diff '--color=auto' -rupN adduser-debian-3.132.orig/adduser adduser-debian-3.132/adduser
---- adduser-debian-3.132.orig/adduser 2023-02-20 17:15:50.375613060 +1030
-+++ adduser-debian-3.132/adduser 2023-02-20 17:21:43.830834709 +1030
-@@ -1252,7 +1252,8 @@ your option) any later version.
+diff '--color=auto' -rupN adduser-debian-3.137.orig/adduser adduser-debian-3.137/adduser
+--- adduser-debian-3.137.orig/adduser 2023-07-02 10:39:55.116339611 +0930
++++ adduser-debian-3.137/adduser 2023-07-02 10:41:25.312400756 +0930
+@@ -1362,7 +1362,8 @@ your option) any later version.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License, /usr/share/common-licenses/GPL, for more details.
+General Public License, /usr/share/licenses/common/GPL2/license.txt,
+for more details.
- ");
+ ") );
}
-diff '--color=auto' -rupN adduser-debian-3.132.orig/deluser adduser-debian-3.132/deluser
---- adduser-debian-3.132.orig/deluser 2023-02-20 17:15:50.378946505 +1030
-+++ adduser-debian-3.132/deluser 2023-02-20 17:22:56.186603271 +1030
-@@ -465,7 +465,8 @@ your option) any later version.
+diff '--color=auto' -rupN adduser-debian-3.137.orig/deluser adduser-debian-3.137/deluser
+--- adduser-debian-3.137.orig/deluser 2023-07-02 10:39:55.119673045 +0930
++++ adduser-debian-3.137/deluser 2023-07-02 10:41:25.312400756 +0930
+@@ -487,7 +487,8 @@ your option) any later version.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License, /usr/share/common-licenses/GPL, for more details.
+General Public License, /usr/share/licenses/common/GPL2/license.txt,
+for more details.
- ");
+ ") );
}
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/adduser.pot adduser-debian-3.132/po/adduser.pot
---- adduser-debian-3.132.orig/po/adduser.pot 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/adduser.pot 2023-02-20 17:23:11.157107172 +1030
-@@ -452,7 +452,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/adduser.pot adduser-debian-3.137/po/adduser.pot
+--- adduser-debian-3.137.orig/po/adduser.pot 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/adduser.pot 2023-07-02 10:41:25.312400756 +0930
+@@ -441,7 +441,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -36,11 +36,11 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/adduser.pot adduser-debia
+"for more details.\n"
msgstr ""
- #: ../adduser:1261
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/ca.po adduser-debian-3.132/po/ca.po
---- adduser-debian-3.132.orig/po/ca.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/ca.po 2023-02-20 17:30:59.979410435 +1030
-@@ -500,7 +500,8 @@ msgid ""
+ #: ../adduser:1387
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/ca.po adduser-debian-3.137/po/ca.po
+--- adduser-debian-3.137.orig/po/ca.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/ca.po 2023-07-02 10:41:25.312400756 +0930
+@@ -508,7 +508,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -50,19 +50,19 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/ca.po adduser-debian-3.13
msgstr ""
"Aquest és programari lliure; podeu redistribuir-lo i/o modificar-lo sota "
"els\n"
-@@ -514,7 +515,7 @@ msgstr ""
+@@ -522,7 +523,7 @@ msgstr ""
"CAP GARANTIA; ni tan sols la garantia implícita de COMERCIABILITAT o "
"ADEQUACIÓ\n"
"PER UN PROPÒSIT PARTICULAR. Vegeu la Llicència Pública General GNU,\n"
-"/usr/share/common-licenses/GPL, per obtenir-ne més detalls.\n"
+"/usr/share/licenses/common/GPL2/license.txt, per obtenir-ne més detalls.\n"
- #: ../adduser:1261
+ #: ../adduser:1387
msgid ""
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/cs.po adduser-debian-3.132/po/cs.po
---- adduser-debian-3.132.orig/po/cs.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/cs.po 2023-02-20 17:31:41.407433593 +1030
-@@ -488,7 +488,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/cs.po adduser-debian-3.137/po/cs.po
+--- adduser-debian-3.137.orig/po/cs.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/cs.po 2023-07-02 10:41:25.312400756 +0930
+@@ -494,7 +494,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -72,19 +72,19 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/cs.po adduser-debian-3.13
msgstr ""
"Tento program je svobodný software; můžete jej šířit a/nebo upravovat\n"
"podle podmínek GNU General Public License verze 2 nebo (dle vašeho\n"
-@@ -496,7 +497,7 @@ msgstr ""
+@@ -502,7 +503,7 @@ msgstr ""
"\n"
"Tento program je distribuovaný v naději, že bude užitečný, ale BEZ\n"
"JAKÉKOLIV ZÁRUKY. Pro více podrobností si přečtěte GNU General\n"
-"Public License v /usr/share/common-licenses/GPL.\n"
+"Public License v /usr/share/licenses/common/GPL2/license.txt.\n"
- #: ../adduser:1261
+ #: ../adduser:1387
msgid ""
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/da.po adduser-debian-3.132/po/da.po
---- adduser-debian-3.132.orig/po/da.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/da.po 2023-02-20 17:33:05.970210379 +1030
-@@ -490,7 +490,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/da.po adduser-debian-3.137/po/da.po
+--- adduser-debian-3.137.orig/po/da.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/da.po 2023-07-02 10:41:25.312400756 +0930
+@@ -496,7 +496,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -94,7 +94,7 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/da.po adduser-debian-3.13
msgstr ""
"Dette program er fri software. Du kan redistribuere og/eller modificere\n"
"det under de betingelser som er angivet i GNU General Public License, som\n"
-@@ -500,8 +501,8 @@ msgstr ""
+@@ -506,8 +507,8 @@ msgstr ""
"Dette program distribueres i håb om at det vil vise sig nyttigt, men UDEN\n"
"NOGEN FORM FOR GARANTI, uden selv de underforståede garantier omkring\n"
"SALGBARHED eller EGNETHED TIL ET BESTEMT FORMÅL. Yderligere detaljer kan\n"
@@ -103,12 +103,12 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/da.po adduser-debian-3.13
+"læses i GNU General Public License. Se\n"
+"/usr/share/licenses/common/GPL2/license.txt, for yderligere detaljer.\n"
- #: ../adduser:1261
+ #: ../adduser:1387
msgid ""
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/de.po adduser-debian-3.132/po/de.po
---- adduser-debian-3.132.orig/po/de.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/de.po 2023-02-20 17:33:49.204967098 +1030
-@@ -507,7 +507,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/de.po adduser-debian-3.137/po/de.po
+--- adduser-debian-3.137.orig/po/de.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/de.po 2023-07-02 10:41:25.312400756 +0930
+@@ -555,7 +555,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -118,19 +118,19 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/de.po adduser-debian-3.13
msgstr ""
"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der\n"
"GNU General Public License, wie von der Free Software Foundation\n"
-@@ -520,7 +521,7 @@ msgstr ""
+@@ -568,7 +569,7 @@ msgstr ""
"implizite\n"
"Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK.\n"
"Details finden Sie in der GNU General Public License\n"
-"(/usr/share/common-licenses/GPL).\n"
+"(/usr/share/licenses/common/GPL2/license.txt).\n"
- #: ../adduser:1261
+ #: ../adduser:1387
msgid ""
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/es.po adduser-debian-3.132/po/es.po
---- adduser-debian-3.132.orig/po/es.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/es.po 2023-02-20 17:34:57.527220887 +1030
-@@ -531,7 +531,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/es.po adduser-debian-3.137/po/es.po
+--- adduser-debian-3.137.orig/po/es.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/es.po 2023-07-02 10:41:25.315734190 +0930
+@@ -539,7 +539,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -140,7 +140,7 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/es.po adduser-debian-3.13
msgstr ""
"Este programa es software libre. Puede redistribuirlo y/o modificarlo\n"
"bajo los términos de la Licencia Pública General de GNU según es\n"
-@@ -542,8 +543,8 @@ msgstr ""
+@@ -550,8 +551,8 @@ msgstr ""
"Este programa se distribuye con la esperanza de que sea útil, pero SIN\n"
"NINGUNA GARANTÍA, incluso sin la garantía MERCANTIL implícita o sin\n"
"garantizar la CONVENIENCIA PARA UN PROPÓSITO PARTICULAR. Véase la\n"
@@ -149,12 +149,12 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/es.po adduser-debian-3.13
+"Licencia Pública General de GNU, en\n"
+"/usr/share/licenses/common/GPL2/license.txt, para más detalles.\n"
- #: ../adduser:1261
+ #: ../adduser:1387
msgid ""
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/eu.po adduser-debian-3.132/po/eu.po
---- adduser-debian-3.132.orig/po/eu.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/eu.po 2023-02-20 17:35:35.138463713 +1030
-@@ -504,7 +504,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/eu.po adduser-debian-3.137/po/eu.po
+--- adduser-debian-3.137.orig/po/eu.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/eu.po 2023-07-02 10:41:25.315734190 +0930
+@@ -512,7 +512,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -164,10 +164,10 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/eu.po adduser-debian-3.13
msgstr ""
"Programa hau software librea da; birbana eta/edo alda dezakezu\n"
"Free Software Foundation-ek argitaratutako GNU Lizentzia Publiko\n"
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/fr.po adduser-debian-3.132/po/fr.po
---- adduser-debian-3.132.orig/po/fr.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/fr.po 2023-02-20 17:36:10.522967545 +1030
-@@ -541,7 +541,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/fr.po adduser-debian-3.137/po/fr.po
+--- adduser-debian-3.137.orig/po/fr.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/fr.po 2023-07-02 10:41:25.315734190 +0930
+@@ -571,7 +571,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -177,19 +177,19 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/fr.po adduser-debian-3.13
msgstr ""
"Ce programme est un logiciel libre, vous pouvez le redistribuer ou le\n"
" modifier selon les termes de la Licence Publique Générale GNU (GPL) telle\n"
-@@ -552,7 +553,7 @@ msgstr ""
+@@ -582,7 +583,7 @@ msgstr ""
"SANS AUCUNE GARANTIE, sans même la garantie implicite de son caractère\n"
"COMMERCIALISABLE ou APPROPRIÉ POUR UN USAGE PRÉCIS. Pour de plus amples\n"
"détails, merci de vous référer à la Licence Publique Générale GNU,\n"
-"/usr/share/common-licenses/GPL.\n"
+"/usr/share/licenses/common/GPL2/license.txt.\n"
- #: ../adduser:1261
+ #: ../adduser:1387
msgid ""
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/gl.po adduser-debian-3.132/po/gl.po
---- adduser-debian-3.132.orig/po/gl.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/gl.po 2023-02-20 17:37:02.044673851 +1030
-@@ -510,7 +510,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/gl.po adduser-debian-3.137/po/gl.po
+--- adduser-debian-3.137.orig/po/gl.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/gl.po 2023-07-02 10:41:25.315734190 +0930
+@@ -551,7 +551,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -199,7 +199,7 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/gl.po adduser-debian-3.13
msgstr ""
"Este programa é libre; pódese redistribuír e/ou modificar segundo\n"
"os termos da Licencia Xeral Pública de GNU, publicada pola \n"
-@@ -520,8 +521,8 @@ msgstr ""
+@@ -561,8 +562,8 @@ msgstr ""
"Este programa distribúese co obxectivo de resultar de utilidade, pero\n"
"SEN NINGUNHA GARANTÍA, nin sequera coa garantía implícita de\n"
"SER AXEITADO PARA NINGÚN MERCADO ou OBXECTIVO INDIVIDUAL. Consulte\n"
@@ -208,12 +208,12 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/gl.po adduser-debian-3.13
+"a Licencia Xeral Pública de GNU,\n"
+"/usr/share/licenses/common/GPL2/license.txt, para máis información.\n"
- #: ../adduser:1261
+ #: ../adduser:1387
msgid ""
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/hu.po adduser-debian-3.132/po/hu.po
---- adduser-debian-3.132.orig/po/hu.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/hu.po 2023-02-20 17:37:36.469148487 +1030
-@@ -506,7 +506,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/hu.po adduser-debian-3.137/po/hu.po
+--- adduser-debian-3.137.orig/po/hu.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/hu.po 2023-07-02 10:41:25.315734190 +0930
+@@ -514,7 +514,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -223,7 +223,7 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/hu.po adduser-debian-3.13
msgstr ""
"Ez a program egy szabad szoftver; a Free Software Foundation \n"
"által kiadott GNU General Public License 2. verziójának vagy \n"
-@@ -517,7 +518,8 @@ msgstr ""
+@@ -525,7 +526,8 @@ msgstr ""
"de minden EGYÉB GARANCIA NÉLKÜL, az eladhatóságra vagy valamely célra\n"
"való alkalmazhatóságra való származtatott garanciát is beleértve.\n"
"További részletekért lásd a GNU General Public License\n"
@@ -231,12 +231,12 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/hu.po adduser-debian-3.13
+"dokumentumot vagy az /usr/share/licenses/common/GPL2/license.txt\n"
+"állományt.\n"
- #: ../adduser:1261
+ #: ../adduser:1387
msgid ""
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/it.po adduser-debian-3.132/po/it.po
---- adduser-debian-3.132.orig/po/it.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/it.po 2023-02-20 17:38:11.196967429 +1030
-@@ -498,7 +498,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/it.po adduser-debian-3.137/po/it.po
+--- adduser-debian-3.137.orig/po/it.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/it.po 2023-07-02 10:41:25.315734190 +0930
+@@ -506,7 +506,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -246,19 +246,19 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/it.po adduser-debian-3.13
msgstr ""
"Questo programma è software libero; è possibile ridistribuirlo e/o\n"
"modificarlo secondo i termini della licenza GNU General Public License,\n"
-@@ -509,7 +510,7 @@ msgstr ""
+@@ -517,7 +518,7 @@ msgstr ""
"SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o\n"
"APPLICABILITÀ PER UNO SCOPO PARTICOLARE. Per maggiori dettagli consultare "
"la\n"
-"GNU General Public License (/usr/share/common-licenses/GPL).\n"
+"GNU General Public License (/usr/share/licenses/common/GPL2/license.txt).\n"
- #: ../adduser:1261
+ #: ../adduser:1387
msgid ""
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/ja.po adduser-debian-3.132/po/ja.po
---- adduser-debian-3.132.orig/po/ja.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/ja.po 2023-02-20 17:38:53.655044029 +1030
-@@ -506,7 +506,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/ja.po adduser-debian-3.137/po/ja.po
+--- adduser-debian-3.137.orig/po/ja.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/ja.po 2023-07-02 10:41:25.315734190 +0930
+@@ -514,7 +514,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -268,7 +268,7 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/ja.po adduser-debian-3.13
msgstr ""
"This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
-@@ -516,7 +517,8 @@ msgstr ""
+@@ -524,7 +525,8 @@ msgstr ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -276,12 +276,12 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/ja.po adduser-debian-3.13
+"General Public License, /usr/share/licenses/common/GPL2/license.txt,\n"
+"for more details.\n"
- #: ../adduser:1261
+ #: ../adduser:1387
msgid ""
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/ko.po adduser-debian-3.132/po/ko.po
---- adduser-debian-3.132.orig/po/ko.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/ko.po 2023-02-20 17:39:16.442467903 +1030
-@@ -460,7 +460,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/ko.po adduser-debian-3.137/po/ko.po
+--- adduser-debian-3.137.orig/po/ko.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/ko.po 2023-07-02 10:41:25.315734190 +0930
+@@ -449,7 +449,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -290,11 +290,11 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/ko.po adduser-debian-3.13
+"for more details.\n"
msgstr ""
- #: ../adduser:1261
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/nb.po adduser-debian-3.132/po/nb.po
---- adduser-debian-3.132.orig/po/nb.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/nb.po 2023-02-20 17:39:56.280459132 +1030
-@@ -498,7 +498,8 @@ msgid ""
+ #: ../adduser:1387
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/nb.po adduser-debian-3.137/po/nb.po
+--- adduser-debian-3.137.orig/po/nb.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/nb.po 2023-07-02 10:41:25.315734190 +0930
+@@ -502,7 +502,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -304,19 +304,19 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/nb.po adduser-debian-3.13
msgstr ""
"Dette programmet er fri programvare. Du kan redistribuerer det og/eller\n"
"endre det under betingelsene gitt i «GNU General Public License» som\n"
-@@ -508,7 +509,7 @@ msgstr ""
+@@ -512,7 +513,7 @@ msgstr ""
"Dette programmet er distribuert under håp om at det vil være nyttig,\n"
"men UTEN NOEN GARANTIER, heller ikke impliserte om SALGBARHET eller\n"
"EGNETHET FOR NOEN SPESIELL ANVENDELSE. Se «GNU General Public License»,\n"
-"/usr/share/common-licenses/GPL, for flere detaljer.\n"
+"/usr/share/licenses/common/GPL2/license.txt, for flere detaljer.\n"
- #: ../adduser:1261
+ #: ../adduser:1387
msgid ""
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/nl.po adduser-debian-3.132/po/nl.po
---- adduser-debian-3.132.orig/po/nl.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/nl.po 2023-02-20 17:40:29.331558743 +1030
-@@ -514,7 +514,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/nl.po adduser-debian-3.137/po/nl.po
+--- adduser-debian-3.137.orig/po/nl.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/nl.po 2023-07-02 10:41:25.315734190 +0930
+@@ -560,7 +560,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -326,7 +326,7 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/nl.po adduser-debian-3.13
msgstr ""
"Dit programma is vrije software; u kunt het distribueren en/of veranderen\n"
"onder de bepalingen van de GNU General Public License, uitgegeven door\n"
-@@ -524,7 +525,8 @@ msgstr ""
+@@ -570,7 +571,8 @@ msgstr ""
"Dit programma wordt verspreid in de hoop dat het bruikbaar is, maar\n"
"ZONDER ENIGE GARANTIE; zelfs zonder de garantie dat\n"
"HET WERKT of HET GESCHIKT IS VOOR EEN DOEL. Bekijk de GNU\n"
@@ -334,12 +334,12 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/nl.po adduser-debian-3.13
+"General Public License, /usr/share/licenses/common/GPL2/license.txt, voor\n"
+"meer details.\n"
- #: ../adduser:1261
+ #: ../adduser:1387
msgid ""
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/pl.po adduser-debian-3.132/po/pl.po
---- adduser-debian-3.132.orig/po/pl.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/pl.po 2023-02-20 17:41:51.924309127 +1030
-@@ -494,7 +494,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/pl.po adduser-debian-3.137/po/pl.po
+--- adduser-debian-3.137.orig/po/pl.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/pl.po 2023-07-02 10:41:25.315734190 +0930
+@@ -498,7 +498,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -349,7 +349,7 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/pl.po adduser-debian-3.13
msgstr ""
"Ten program jest darmowy; możesz go redystrybuować i/lub modyfikować\n"
"zgodnie z warunkami Ogólnej Licencji Publicznej GNU opublikowanej przez\n"
-@@ -504,7 +505,8 @@ msgstr ""
+@@ -508,7 +509,8 @@ msgstr ""
"Ten program jest dystrybuowany w nadziei, że będzie użyteczny, ale\n"
"autorzy NIE DAJĄ ŻADNYCH GWARANCJI; w tym gwarancji PRZYDATNOŚCI\n"
"DO SPRZEDAŻY ani DO KONKRETNYCH CELÓW. Szczegóły można znaleźć w Ogólnej\n"
@@ -357,12 +357,12 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/pl.po adduser-debian-3.13
+"Licencji Publicznej GNU w pliku\n"
+"/usr/share/licenses/common/GPL2/license.txt.\n"
- #: ../adduser:1261
+ #: ../adduser:1387
msgid ""
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/pt_BR.po adduser-debian-3.132/po/pt_BR.po
---- adduser-debian-3.132.orig/po/pt_BR.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/pt_BR.po 2023-02-20 17:42:19.238552762 +1030
-@@ -512,7 +512,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/pt_BR.po adduser-debian-3.137/po/pt_BR.po
+--- adduser-debian-3.137.orig/po/pt_BR.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/pt_BR.po 2023-07-02 10:41:25.315734190 +0930
+@@ -520,7 +520,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -372,7 +372,7 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/pt_BR.po adduser-debian-3
msgstr ""
"Este programa é software livre; você pode redistribuí-lo e/ou\n"
"modificá-lo sob os termos da Licença Pública Geral GNU conforme\n"
-@@ -522,7 +523,8 @@ msgstr ""
+@@ -530,7 +531,8 @@ msgstr ""
"Este programa é distribuído na expectativa de que seja útil, porém,\n"
"SEM NENHUMA GARANTIA; nem mesmo a garantia implícita de COMERCIABILIDADE\n"
"OU ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. Consulte a Licença Pública\n"
@@ -380,12 +380,12 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/pt_BR.po adduser-debian-3
+"Geral do GNU, /usr/share/licenses/common/GPL2/license.txt, para mais\n"
+"detalhes.\n"
- #: ../adduser:1261
+ #: ../adduser:1387
msgid ""
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/pt.po adduser-debian-3.132/po/pt.po
---- adduser-debian-3.132.orig/po/pt.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/pt.po 2023-02-20 17:42:54.403058503 +1030
-@@ -521,7 +521,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/pt.po adduser-debian-3.137/po/pt.po
+--- adduser-debian-3.137.orig/po/pt.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/pt.po 2023-07-02 10:41:25.319067624 +0930
+@@ -548,7 +548,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -395,19 +395,19 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/pt.po adduser-debian-3.13
msgstr ""
"Este programa é software livre; você pode redistribuí-lo e/ou modifica-lo\n"
"sob os termos da GNU General Public License conforme publicada pela Free\n"
-@@ -531,7 +532,7 @@ msgstr ""
+@@ -558,7 +559,7 @@ msgstr ""
"Este programa é distribuído com a esperança de que seja útil, mas SEM\n"
"QUALQUER GARANTIA; mesmo sem a garantia implícita de COMERCIALIZAÇÃO OU\n"
"ADEQUAÇÃO A UM DETERMINADO PROPÓSITO. Para mais detalhes, veja a\n"
-"GNU General Public License em /usr/share/common-licenses/GPL.\n"
+"GNU General Public License em /usr/share/licenses/common/GPL2/license.txt.\n"
- #: ../adduser:1261
+ #: ../adduser:1387
msgid ""
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/ru.po adduser-debian-3.132/po/ru.po
---- adduser-debian-3.132.orig/po/ru.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/ru.po 2023-02-20 17:43:19.077214796 +1030
-@@ -498,7 +498,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/ru.po adduser-debian-3.137/po/ru.po
+--- adduser-debian-3.137.orig/po/ru.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/ru.po 2023-07-02 10:41:25.319067624 +0930
+@@ -499,7 +499,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -417,7 +417,7 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/ru.po adduser-debian-3.13
msgstr ""
"This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
-@@ -508,7 +509,8 @@ msgstr ""
+@@ -509,7 +510,8 @@ msgstr ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -425,12 +425,12 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/ru.po adduser-debian-3.13
+"General Public License, /usr/share/licenses/common/GPL2/license.txt,\n"
+"for more details.\n"
- #: ../adduser:1261
+ #: ../adduser:1387
msgid ""
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/sk.po adduser-debian-3.132/po/sk.po
---- adduser-debian-3.132.orig/po/sk.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/sk.po 2023-02-20 17:43:40.344590985 +1030
-@@ -493,7 +493,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/sk.po adduser-debian-3.137/po/sk.po
+--- adduser-debian-3.137.orig/po/sk.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/sk.po 2023-07-02 10:41:25.319067624 +0930
+@@ -501,7 +501,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -440,10 +440,10 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/sk.po adduser-debian-3.13
msgstr ""
"Tento program je slobodný softvér; môžete ho šíriť a/alebo meniť\n"
"za podmienok GNU General Public License (GNU GPL), ktorú publikovala\n"
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/sv.po adduser-debian-3.132/po/sv.po
---- adduser-debian-3.132.orig/po/sv.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/sv.po 2023-02-20 17:44:15.082416936 +1030
-@@ -501,7 +501,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/sv.po adduser-debian-3.137/po/sv.po
+--- adduser-debian-3.137.orig/po/sv.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/sv.po 2023-07-02 10:41:25.319067624 +0930
+@@ -509,7 +509,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -453,7 +453,7 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/sv.po adduser-debian-3.13
msgstr ""
"Följande text är en informell översättning som enbart tillhandahålls i\n"
"informativt syfte. För alla juridiska tolkningar gäller den engelska\n"
-@@ -515,8 +516,8 @@ msgstr ""
+@@ -523,8 +524,8 @@ msgstr ""
"Detta program distribueras i hopp om att det ska vara användbart,\n"
"men UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti\n"
"om SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU\n"
@@ -462,12 +462,12 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/sv.po adduser-debian-3.13
+"General Public License, /usr/share/licenses/common/GPL2/license.txt\n"
+"för ytterligare information.\n"
- #: ../adduser:1261
+ #: ../adduser:1387
msgid ""
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/uk.po adduser-debian-3.132/po/uk.po
---- adduser-debian-3.132.orig/po/uk.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/uk.po 2023-02-20 17:45:01.610637021 +1030
-@@ -490,7 +490,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/uk.po adduser-debian-3.137/po/uk.po
+--- adduser-debian-3.137.orig/po/uk.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/uk.po 2023-07-02 10:41:25.319067624 +0930
+@@ -486,7 +486,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -477,19 +477,19 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/uk.po adduser-debian-3.13
msgstr ""
"Ця програма - вільне програмне забезпечення; Ви можете розповсюджувати\n"
"її та/або вносити зміни відповідно до умов Загальної Публічної\n"
-@@ -502,7 +503,7 @@ msgstr ""
+@@ -498,7 +499,7 @@ msgstr ""
"корисною, але БЕЗ БУДЬ-ЯКОЇ ҐАРАНТІЇ, без навіть УЯВНОЇ ҐАРАНТІЇ\n"
"КОМЕРЦІЙНОЇ ПРИДАТНОСТІ чи ВІДПОВІДНОСТІ БУДЬ-ЯКОМУ ПЕВНОМУ\n"
"ЗАСТОСУВАННЮ. Зверніться до Загальної Публічної Ліцензії GNU,\n"
-"/usr/share/common-licenses/GPL, за подробицями.\n"
+"/usr/share/licenses/common/GPL2/license.txt, за подробицями.\n"
- #: ../adduser:1261
+ #: ../adduser:1387
msgid ""
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/vi.po adduser-debian-3.132/po/vi.po
---- adduser-debian-3.132.orig/po/vi.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/vi.po 2023-02-20 17:46:00.562606214 +1030
-@@ -503,7 +503,8 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/vi.po adduser-debian-3.137/po/vi.po
+--- adduser-debian-3.137.orig/po/vi.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/vi.po 2023-07-02 10:41:25.319067624 +0930
+@@ -505,7 +505,8 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -499,7 +499,7 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/vi.po adduser-debian-3.13
msgstr ""
"Chương trình này là phần mềm tự do; bạn có thể phát hành lại nó\n"
"và/hoặc sửa đổi nó với điều kiện của Giấy Phép Công Cộng GNU\n"
-@@ -513,8 +514,8 @@ msgstr ""
+@@ -515,8 +516,8 @@ msgstr ""
"Chương trình này được phát hành vì mong muốn nó có ích,\n"
"nhưng KHÔNG CÓ BẢO HÀNH GÌ CẢ, THẬM CHÍ KHÔNG CÓ BẢO ĐẢM\n"
"ĐƯỢC NGỤ Ý KHẢ NĂNG BÁN HAY KHẢ NĂNG LÀM ĐƯỢC VIỆC DỨT KHOÁT.\n"
@@ -508,12 +508,12 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/vi.po adduser-debian-3.13
+"Xem Giấy Phép Công Cộng GNU\n"
+"(/usr/share/licenses/common/GPL2/license.txt) để biết thêm chi tiết.\n"
- #: ../adduser:1261
+ #: ../adduser:1387
msgid ""
-diff '--color=auto' -rupN adduser-debian-3.132.orig/po/zh_CN.po adduser-debian-3.132/po/zh_CN.po
---- adduser-debian-3.132.orig/po/zh_CN.po 2023-02-20 17:15:50.382279951 +1030
-+++ adduser-debian-3.132/po/zh_CN.po 2023-02-20 17:47:04.898089689 +1030
-@@ -479,14 +479,15 @@ msgid ""
+diff '--color=auto' -rupN adduser-debian-3.137.orig/po/zh_CN.po adduser-debian-3.137/po/zh_CN.po
+--- adduser-debian-3.137.orig/po/zh_CN.po 2023-07-02 10:39:55.123006478 +0930
++++ adduser-debian-3.137/po/zh_CN.po 2023-07-02 10:41:25.319067624 +0930
+@@ -495,14 +495,15 @@ msgid ""
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
@@ -530,5 +530,5 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/po/zh_CN.po adduser-debian-3
+"性有隐含的保证。关于GNU公共条款详细信息请参见"
+"/usr/share/licenses/common/GPL2/license.txt。\n"
- #: ../adduser:1261
+ #: ../adduser:1387
msgid ""
diff --git a/arch-policy.patch b/arch-policy.patch
index 57f4031212c6..4c84dc8869d0 100644
--- a/arch-policy.patch
+++ b/arch-policy.patch
@@ -1,7 +1,7 @@
-diff '--color=auto' -rupN adduser-debian-3.132.orig/AdduserCommon.pm adduser-debian-3.132/AdduserCommon.pm
---- adduser-debian-3.132.orig/AdduserCommon.pm 2023-03-07 18:08:25.694341050 +1030
-+++ adduser-debian-3.132/AdduserCommon.pm 2023-03-07 18:11:00.172778792 +1030
-@@ -286,18 +286,18 @@ sub preseed_config {
+diff '--color=auto' -rupN adduser-debian-3.137.orig/AdduserCommon.pm adduser-debian-3.137/AdduserCommon.pm
+--- adduser-debian-3.137.orig/AdduserCommon.pm 2023-07-02 10:32:42.759707646 +0930
++++ adduser-debian-3.137/AdduserCommon.pm 2023-07-02 10:34:38.413283193 +0930
+@@ -293,18 +293,18 @@ sub preseed_config {
backup => 0,
backup_to => ".",
dshell => "/bin/bash",
@@ -25,7 +25,7 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/AdduserCommon.pm adduser-deb
users_group => undef,
grouphomes => "no",
letterhomes => "no",
-@@ -306,8 +306,8 @@ sub preseed_config {
+@@ -313,8 +313,8 @@ sub preseed_config {
sys_dir_mode => "0755",
setgid_home => "no",
no_del_paths => "^/bin\$ ^/boot\$ ^/dev\$ ^/etc\$ ^/initrd ^/lib ^/lost+found\$ ^/media\$ ^/mnt\$ ^/opt\$ ^/proc\$ ^/root\$ ^/run\$ ^/sbin\$ ^/srv\$ ^/sys\$ ^/tmp\$ ^/usr\$ ^/var\$ ^/vmlinu",
@@ -36,10 +36,10 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/AdduserCommon.pm adduser-deb
exclude_fstypes => "(proc|sysfs|usbfs|devpts|devtmpfs|devfs|afs)",
skel_ignore_regex => "\.(dpkg|ucf)-(old|new|dist)\$",
extra_groups => "users",
-diff '--color=auto' -rupN adduser-debian-3.132.orig/adduser.conf adduser-debian-3.132/adduser.conf
---- adduser-debian-3.132.orig/adduser.conf 2023-03-07 18:08:25.694341050 +1030
-+++ adduser-debian-3.132/adduser.conf 2023-03-07 18:12:36.269287490 +1030
-@@ -21,21 +21,21 @@
+diff '--color=auto' -rupN adduser-debian-3.137.orig/adduser.conf adduser-debian-3.137/adduser.conf
+--- adduser-debian-3.137.orig/adduser.conf 2023-07-02 10:32:42.759707646 +0930
++++ adduser-debian-3.137/adduser.conf 2023-07-02 10:34:38.413283193 +0930
+@@ -31,21 +31,21 @@
# Specify inclusive ranges of UIDs and GIDs from which UIDs and GIDs
# for system users, system groups, non-system users and non-system groups
# can be dynamically allocated.
@@ -69,7 +69,7 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/adduser.conf adduser-debian-
# Specify a file or a directory containing UID and GID pool.
#UID_POOL=/etc/adduser-pool.conf
-@@ -52,7 +52,8 @@
+@@ -62,7 +62,8 @@
# non-system users are placed into.
# It is a configuration error to define both variables
# even if the values are consistent.
@@ -79,7 +79,7 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/adduser.conf adduser-debian-
#USERS_GID=100
#USERS_GROUP=users
-@@ -71,13 +72,13 @@
+@@ -81,13 +82,13 @@
# Non-system user- and groupnames are checked against this regular
# expression.
@@ -97,10 +97,10 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/adduser.conf adduser-debian-
# When populating the newly created home directory of a non-system user,
# files in SKEL matching this regex are not copied.
-diff '--color=auto' -rupN adduser-debian-3.132.orig/doc/adduser.conf.5 adduser-debian-3.132/doc/adduser.conf.5
---- adduser-debian-3.132.orig/doc/adduser.conf.5 2023-03-07 18:08:25.697674494 +1030
-+++ adduser-debian-3.132/doc/adduser.conf.5 2023-03-07 18:10:36.715337017 +1030
-@@ -62,17 +62,17 @@ Defaults to \fIusers\fP.
+diff '--color=auto' -rupN adduser-debian-3.137.orig/doc/adduser.conf.5 adduser-debian-3.137/doc/adduser.conf.5
+--- adduser-debian-3.137.orig/doc/adduser.conf.5 2023-07-02 10:32:42.763041082 +0930
++++ adduser-debian-3.137/doc/adduser.conf.5 2023-07-02 10:34:38.413283193 +0930
+@@ -76,17 +76,17 @@ Defaults to \fIusers\fP.
.B FIRST_SYSTEM_GID " and " LAST_SYSTEM_GID
specify an inclusive range of GIDs from which GIDs
for system groups can be dynamically allocated.
@@ -121,7 +121,7 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/doc/adduser.conf.5 adduser-d
Please note that system software,
such as the users allocated by the \fIbase-passwd\fP package,
may assume that UIDs less than 100 are unallocated.
-@@ -80,7 +80,7 @@ may assume that UIDs less than 100 are u
+@@ -94,7 +94,7 @@ may assume that UIDs less than 100 are u
.B FIRST_UID " and " LAST_UID
specify an inclusive range of UIDs from which UIDs
for non-system users can be dynamically allocated.
@@ -130,18 +130,18 @@ diff '--color=auto' -rupN adduser-debian-3.132.orig/doc/adduser.conf.5 adduser-d
.TP
.B GID_POOL
See \fBUID_POOL\fP.
-@@ -113,7 +113,7 @@ user and group creation in \fBadduser\fR
- unless \-\-allow\-bad\-names is set.
- With \-\-allow\-bad\-names set,
+@@ -127,7 +127,7 @@ user and group creation in \fBadduser\fR
+ unless \fB\-\-allow\-bad\-names\fR is set.
+ With \fB\-\-allow\-bad\-names\fR set,
weaker checks are performed.
-Defaults to the most conservative \fI^[a\-z][\-a\-z0\-9_]*$\fP.
+Defaults to the Arch policy \fI^[a\-zA\-Z0\-9_][\-a\-zA\-Z0\-9_]*\\$?$\fP.
See \fBSYS_NAME_REGXEX\fP and \fBValid names\fP,
below, for more information.
.TP
-@@ -161,7 +161,7 @@ system user and group creation in adduse
- unless \-\-allow\-bad\-names is set.
- With \-\-allow\-bad\-names set,
+@@ -175,7 +175,7 @@ system user and group creation in adduse
+ unless \fB\-\-allow\-bad\-names\fP is set.
+ With \fB\-\-allow\-bad\-names\fP set,
weaker checks are performed.
-Defaults to the most conservative \fI^[a\-z_][\-a\-z0\-9_]*$\fP.
+Defaults to the Arch policy \fI^[a\-zA\-Z0\-9_][\-a\-zA\-Z0\-9_]*\\$?$\fP.