[Pkg-samba-maint] [Git][samba-team/samba][master] 6 commits: d/rules: do not explicitly enable quotas on non-linux
Michael Tokarev (@mjt)
gitlab at salsa.debian.org
Thu Nov 3 12:05:45 GMT 2022
Michael Tokarev pushed to branch master at Debian Samba Team / samba
Commits:
382745a7 by Michael Tokarev at 2022-11-02T21:48:38+03:00
d/rules: do not explicitly enable quotas on non-linux
The idea is to explicitly enable everything interesting on linux,
but let ./configure to figure it out on other OSes. If quota will
be supported on Hurd one day, it will be enabled automatically there.
- - - - -
fbc99573 by Michael Tokarev at 2022-11-02T21:49:44+03:00
d/rules: no need to disable systemd on non-linux, let ./configure to figure it
- - - - -
1eb07efc by Michael Tokarev at 2022-11-03T14:50:05+03:00
d/winbind.postinst: switch addgroup => groupadd and eliminate getent
This fixes piuparts failure. Apparently some other package dropped
adduser dependency and winbind package started failing.
Apparently adduser is not needed: addgroup does the same but easier,
its --force mode combines a check for group existance and group
creation if it doesn't exist.
- - - - -
24258d59 by Michael Tokarev at 2022-11-03T14:52:13+03:00
d/samba.postinst: switch addgroup => groupadd and eliminate getent
- - - - -
a3e8d554 by Michael Tokarev at 2022-11-03T14:58:53+03:00
d/smb.conf: use useradd in example create user script too
- - - - -
1907d4f1 by Michael Tokarev at 2022-11-03T15:05:16+03:00
update changelog; upload 4.17.2+dfsg-8 to unstable
- - - - -
5 changed files:
- debian/changelog
- debian/rules
- debian/samba.postinst
- debian/smb.conf
- debian/winbind.postinst
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+samba (2:4.17.2+dfsg-8) unstable; urgency=medium
+
+ * d/rules: do not explicitly enable quotas on non-linux:
+ enable everything interesting on linux explicitly and let ./configure
+ to figure it out in other systems. This should fix FTBFS problem on hurd.
+ * d/rules: do not disable systemd on non-linux, let ./configure figure it out
+ * d/winbind.postinst: switch addgroup => groupadd and eliminate getent.
+ winbind package never declared dependency on adduser but always used
+ addgroup command in its postinst script. Finally this broke piuparts.
+ Switch to groupadd which is even easier to use.
+ * d/samba.postinst: switch addgroup => groupadd and eliminate getent
+ * d/smb.conf: use useradd in example create user script too
+
+ -- Michael Tokarev <mjt at tls.msk.ru> Thu, 03 Nov 2022 15:04:46 +0300
+
samba (2:4.17.2+dfsg-7) unstable; urgency=medium
* another way to work around #1013259: provide a compatibility symlink
=====================================
debian/rules
=====================================
@@ -71,7 +71,6 @@ conf_args = \
--with-syslog \
--with-utmp \
--with-winbind \
- --with-quota \
--with-automount \
--with-ldap \
--with-ads \
@@ -93,11 +92,11 @@ conf_args = \
ifeq (${DEB_HOST_ARCH_OS}, linux)
conf_args += \
+ --with-quota \
+ \
--with-systemd \
--systemd-install-services \
--with-systemddir=/lib/systemd/system
-else
-conf_args += --without-systemd
endif
binary binary-arch binary-indep \
=====================================
debian/samba.postinst
=====================================
@@ -57,11 +57,8 @@ umask 022
if [ configure = "$1" -a -z "$2" ] # only do this if not upgrading
then
- # add the sambashare group
- if ! getent group sambashare > /dev/null 2>&1
- then
- addgroup --system sambashare
- fi
+ # add the sambashare group; --force: ok if group already exist
+ groupadd --force --system sambashare
if [ ! -e /var/lib/samba/usershares ]
then
install -d -m 1770 -g sambashare /var/lib/samba/usershares
=====================================
debian/smb.conf
=====================================
@@ -128,7 +128,7 @@
# This allows Unix users to be created on the domain controller via the SAMR
# RPC pipe. The example command creates a user account with a disabled Unix
# password; please adapt to your needs
-; add user script = /usr/sbin/adduser --quiet --disabled-password --gecos "" %u
+; add user script = /usr/sbin/useradd --create-home %u
# This allows machine accounts to be created on the domain controller via the
# SAMR RPC pipe.
=====================================
debian/winbind.postinst
=====================================
@@ -34,8 +34,8 @@ mask_services() {
fi
}
-getent group winbindd_priv >/dev/null 2>&1 ||
- addgroup --system --force-badname --quiet winbindd_priv
+# groupadd --force: ok if group already exist
+groupadd --system --force winbindd_priv
winbindd_privileged_socket_directory='/var/lib/samba/winbindd_privileged'
mkdir -pv "$winbindd_privileged_socket_directory"
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/ed8dfaa1ffdd7f69be5f0c8e7a426fae30c44bc0...1907d4f10a695b14c5ca4a10e40854f583162f3a
--
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/ed8dfaa1ffdd7f69be5f0c8e7a426fae30c44bc0...1907d4f10a695b14c5ca4a10e40854f583162f3a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20221103/b4f5f682/attachment-0001.htm>
More information about the Pkg-samba-maint
mailing list