[Pkg-samba-maint] [Git][samba-team/samba][master] 3 commits: samba, winbind: remove logrotate scripts
Michael Tokarev (@mjt)
gitlab at salsa.debian.org
Tue Jan 30 09:16:22 GMT 2024
Michael Tokarev pushed to branch master at Debian Samba Team / samba
Commits:
32625ceb by Michael Tokarev at 2024-01-12T20:12:55+03:00
samba,winbind: remove logrotate scripts
samba does its own log rotation (max log size (=5000 by default) and
renaming to .old). The two clashes with each other in an interesting
way. Should probably check if `max log size` is not set to 0.
- - - - -
e5c17c1f by Michael Tokarev at 2024-01-30T12:07:32+03:00
d/samba-libs.symbols, d/control: make libndrN a virtual package to ensure rdeps pick the right dependency
- - - - -
86eadeb1 by Michael Tokarev at 2024-01-30T12:14:18+03:00
update changelog; upload version 4.19.4+dfsg-3 to unstable
- - - - -
8 changed files:
- debian/changelog
- debian/control
- + debian/samba-common.NEWS
- debian/samba-libs.symbols
- − debian/samba.logrotate
- debian/samba.maintscript
- − debian/winbind.logrotate
- + debian/winbind.maintscript
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+samba (2:4.19.4+dfsg-3) unstable; urgency=medium
+
+ * samba,winbind: remove logrotate scripts
+ samba does its own log rotation (max log size (=5000 by default) and renaming
+ to .old). The two clashes with each other in an interesting way.
+ * d/samba-libs.symbols, d/control: make libndrN a virtual package to ensure rdeps
+ pick the right dependency
+
+ -- Michael Tokarev <mjt at tls.msk.ru> Tue, 30 Jan 2024 12:12:42 +0300
+
samba (2:4.19.4+dfsg-2) unstable; urgency=medium
* d/samba.smbd.service, d/samba.nmbd.service: expand forgotten @BINDIR@
=====================================
debian/control
=====================================
@@ -96,7 +96,6 @@ Depends: passwd,
${python3:Depends},
${shlibs:Depends}
Recommends: attr,
- logrotate,
python3-markdown,
samba-dsdb-modules,
samba-vfs-modules,
@@ -131,6 +130,7 @@ Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Architecture: any
Section: libs
+Provides: libndr3 (= ${binary:Version})
Depends: ${misc:Depends}, ${shlibs:Depends},
# since libldb ABI is incorrectly versioned resulting in breakage like #1021371,
# just require libldb version of the same build
@@ -508,7 +508,7 @@ Depends: iproute2 [linux-any],
${misc:Depends},
${shlibs:Depends}
Recommends: ethtool [linux-any], python3:any, python3-etcd, ${rados:Depends}
-Suggests: logrotate, lsof
+Suggests: lsof
Description: clustered database to store temporary data
CTDB is a cluster implementation of the TDB database used by Samba and other
projects to store temporary data. If an application is already using TDB for
=====================================
debian/samba-common.NEWS
=====================================
@@ -0,0 +1,16 @@
+samba-common (2:4.19.4+dfsg-3) unstable; urgency=medium
+
+ /etc/logrotate.d/samba and /etc/logrotate/winbind logrotate scripts
+ has been removed.
+
+ Samba has its own log rotation implementation internally, renaming the
+ current log file with .old extension when the log grows larger than
+ max log size parameter in smb.conf (default is 5000Kb). Also, samba
+ now writes quite a lot more log files for various components, and if
+ per-client logging is enabled, the per-client log files aren't covered
+ by the old logrotate script.
+
+ If you disabled internal samba log rotation, please re-enable it or else
+ the logs will grow in an uncontrollable way.
+
+ -- Michael Tokarev <mjt at tls.msk.ru> Fri, 12 Jan 2024 20:03:05 +0300
=====================================
debian/samba-libs.symbols
=====================================
@@ -1,4 +1,4 @@
-libndr.so.3 #PACKAGE# #MINVER#
+libndr.so.3 libndr3 #MINVER#
* Build-Depends-Package: samba-dev
GUID_all_zero at NDR_0.0.1 2:4.17.2
GUID_buf_string at NDR_0.0.4 2:4.17.2
=====================================
debian/samba.logrotate deleted
=====================================
@@ -1,40 +0,0 @@
-/var/log/samba/log.smbd {
- weekly
- missingok
- rotate 7
- postrotate
- [ ! -x /usr/bin/smbcontrol ] || [ ! -f /run/samba/smbd.pid ] || /usr/bin/smbcontrol smbd reload-config
- endscript
- compress
- delaycompress
- notifempty
-}
-
-/var/log/samba/log.nmbd {
- weekly
- missingok
- rotate 7
- postrotate
- [ ! -x /usr/bin/smbcontrol ] || [ ! -f /run/samba/nmbd.pid ] || /usr/bin/smbcontrol nmbd reload-config
- endscript
- compress
- delaycompress
- notifempty
-}
-
-/var/log/samba/log.samba {
- weekly
- missingok
- rotate 7
- postrotate
- if [ -d /run/systemd/system ] && command systemctl >/dev/null 2>&1 && systemctl is-active --quiet samba-ad-dc; then
- systemctl kill --kill-who all --signal=SIGHUP samba-ad-dc
- elif [ -f /run/samba/samba.pid ]; then
- # This only sends to main pid, See #803924
- kill -HUP `cat /run/samba/samba.pid`
- fi
- endscript
- compress
- delaycompress
- notifempty
-}
=====================================
debian/samba.maintscript
=====================================
@@ -1 +1,2 @@
rm_conffile /etc/cron.daily/samba 2:4.19.3+dfsg-3~
+rm_conffile /etc/logrotate.d/samba 2:4.19.4+dfsg-3~
=====================================
debian/winbind.logrotate deleted
=====================================
@@ -1,17 +0,0 @@
-/var/log/samba/log.winbindd {
- weekly
- missingok
- rotate 7
- postrotate
- if [ -f /var/run/samba/winbindd.pid ]; then
- if [ -x /usr/bin/smbcontrol ]; then
- /usr/bin/smbcontrol winbindd reload-config
- elif [ -f /run/samba/winbindd.pid ]; then
- kill -HUP `cat /run/samba/winbindd.pid`
- fi
- fi
- endscript
- compress
- delaycompress
- notifempty
-}
=====================================
debian/winbind.maintscript
=====================================
@@ -0,0 +1 @@
+rm_conffile /etc/logrotate.d/winbind 2:4.19.4+dfsg-3~
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/9885cf6bf58d0e0e2fd295d56c3ae1d246382eb3...86eadeb1de7532534d0ddfbc18ffdfcf5139dbb4
--
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/9885cf6bf58d0e0e2fd295d56c3ae1d246382eb3...86eadeb1de7532534d0ddfbc18ffdfcf5139dbb4
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/20240130/d8cbee57/attachment-0001.htm>
More information about the Pkg-samba-maint
mailing list