From b3e974f669474495edd367eac6633bd03e95f949 Mon Sep 17 00:00:00 2001 From: Serge Naboko Date: Wed, 16 Jul 2025 11:53:38 +0300 Subject: [PATCH 1/3] Fix /usr/spool/bitspool group on installation --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index c03f41e..ab4ebc1 100644 --- a/Makefile +++ b/Makefile @@ -393,6 +393,9 @@ install: mkdir -p /var/spool/bitnet chgrp ${NJEGRP} /var/spool/bitnet chmod g+w /var/spool/bitnet + mkdir -p /usr/spool/bitspool + chgrp ${NJEGRP} /usr/spool/bitspool + chmod g+r /var/spool/bitnet chmod g+s ${BINDIR}/sendfile ${BINDIR}/tell ${BINDIR}/ygone \ ${LIBDIR}/bmail $(INSTALL) -s -m 755 transfer ${LIBDIR}/transfer From c71bb4e19cbe19b9a18464b7a59001cfde2620ba Mon Sep 17 00:00:00 2001 From: Serge Naboko Date: Wed, 16 Jul 2025 12:39:45 +0300 Subject: [PATCH 2/3] Tune permissions and fix location --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ab4ebc1..cc794ce 100644 --- a/Makefile +++ b/Makefile @@ -395,7 +395,7 @@ install: chmod g+w /var/spool/bitnet mkdir -p /usr/spool/bitspool chgrp ${NJEGRP} /usr/spool/bitspool - chmod g+r /var/spool/bitnet + chmod g=rx,o-rwx /usr/spool/bitspool chmod g+s ${BINDIR}/sendfile ${BINDIR}/tell ${BINDIR}/ygone \ ${LIBDIR}/bmail $(INSTALL) -s -m 755 transfer ${LIBDIR}/transfer From 2d2e28d139eb52adb9492bbf672262c02a35e5bb Mon Sep 17 00:00:00 2001 From: Serge Naboko Date: Mon, 21 Jul 2025 12:55:15 +0300 Subject: [PATCH 3/3] Move bitspool to /var (part 1) --- ChangeLog | 2 +- Makefile | 6 +++--- README.INSTALL | 2 +- file-exit.cf | 4 ++-- funetnje.texinfo | 8 ++++---- man/funetnje.8 | 6 +++--- man/funetnje.8.ps | Bin 28673 -> 28673 bytes man/qrdr.8 | 4 ++-- man/qrdr.8.ps | Bin 10511 -> 10511 bytes 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4180671..2a10b99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1740,7 +1740,7 @@ Tue Oct 12 10:27:08 1993 Matti Aarnio (mea@nic.funet.fi) * Implemented dual spool system: (configurable) /usr/spool/bitnet/LINKNAME/ - for transmission links - /usr/spool/bitspool/USERNAME/ - for local users + /var/spool/bitspool/USERNAME/ - for local users * Wrote UNIX man-pages of the system diff --git a/Makefile b/Makefile index cc794ce..397d2bd 100644 --- a/Makefile +++ b/Makefile @@ -393,9 +393,9 @@ install: mkdir -p /var/spool/bitnet chgrp ${NJEGRP} /var/spool/bitnet chmod g+w /var/spool/bitnet - mkdir -p /usr/spool/bitspool - chgrp ${NJEGRP} /usr/spool/bitspool - chmod g=rx,o-rwx /usr/spool/bitspool + mkdir -p /var/spool/bitspool + chgrp ${NJEGRP} /var/spool/bitspool + chmod g=rx,o-rwx /var/spool/bitspool chmod g+s ${BINDIR}/sendfile ${BINDIR}/tell ${BINDIR}/ygone \ ${LIBDIR}/bmail $(INSTALL) -s -m 755 transfer ${LIBDIR}/transfer diff --git a/README.INSTALL b/README.INSTALL index 222902d..e5f93c1 100644 --- a/README.INSTALL +++ b/README.INSTALL @@ -51,7 +51,7 @@ In detach.c: inheritance) Decide where you put your user spool directories, exaple: - /usr/spool/bitspool + /var/spool/bitspool However HAVE THEM ON SAME PHYSICAL DEVICE so that rename(2) (or rename(3)) can be used successfully to place files into there. Directory can have protection 111, or 555. Nobody diff --git a/file-exit.cf b/file-exit.cf index 6a55a4b..d940eba 100644 --- a/file-exit.cf +++ b/file-exit.cf @@ -16,8 +16,8 @@ # Exit users: POSTMAST (exits start as root anyway.) # Exited reals: real protections, programs start with setuid() user. -Spool-Dir: /usr/spool/bitspool/ -Postmast-Dir: /usr/spool/bitspool/POSTMAST +Spool-Dir: /var/spool/bitspool/ +Postmast-Dir: /var/spool/bitspool/POSTMAST # Now list of things to match and then what to do # To do keywords: DISCARD to /dev/null. diff --git a/funetnje.texinfo b/funetnje.texinfo index 704ab99..8a61ecc 100644 --- a/funetnje.texinfo +++ b/funetnje.texinfo @@ -698,8 +698,8 @@ Such wrapping is not allowed in the real configuration file! # Exited reals: real protections, programs start with setuid() # user. -Spool-Dir: /usr/spool/bitspool/ -Postmast-Dir: /usr/spool/bitspool/POSTMAST +Spool-Dir: /var/spool/bitspool/ +Postmast-Dir: /var/spool/bitspool/POSTMAST # Now list of things to match and then what to do # To do keywords: DISCARD to /dev/null. @@ -988,7 +988,7 @@ communication with the BITNET. Shows a listing of user's BITNET spool -- the `reader'. @example @cartouche -QRDR: Spool dir: `/usr/spool/bitspool/MEA/' +QRDR: Spool dir: `/var/spool/bitspool/MEA/' From: To: FName: FExt: Type Form: SpoolID NETSERV@@FINHUT MEA@@FINFILES NETSERV NOTE PUN A QUFINHUT 0001 NETSERV@@FINHUT MEA@@FINFILES NETSERV NOTE PUN A QUFINHUT 0002 @@ -1016,7 +1016,7 @@ consulted with effective uid. Spool directory is determined using same mechanism as in @emph{funetnje} main program. Sample configuration of file procesing exits gives directory -@file{/usr/spool/bitspool} in which UPPERCASE userids +@file{/var/spool/bitspool} in which UPPERCASE userids (or pseudoids - MAILER is one such) are `user' specific subdirectories containing individual spooled files. diff --git a/man/funetnje.8 b/man/funetnje.8 index cae7ca4..a6db094 100644 --- a/man/funetnje.8 +++ b/man/funetnje.8 @@ -163,8 +163,8 @@ Sample \f4# Exit users: POSTMAST (exits start as root anyway.) \f4# Exited reals: real protections, programs start with setuid() user. \f4 -\f4Spool-Dir: /usr/spool/bitspool/ -\f4Postmast-Dir: /usr/spool/bitspool/POSTMAST +\f4Spool-Dir: /var/spool/bitspool/ +\f4Postmast-Dir: /var/spool/bitspool/POSTMAST \f4 \f4# Now list of things to match and then what to do \f4# To do keywords: DISCARD to /dev/null. @@ -352,7 +352,7 @@ binary format. Transporter internal usage. Recipient spool directories have also these .B .spoolid files, and their function is similar; keep status log. -.IP "\fB/usr/spool/bitspool/\fR" 1.0i 0 +.IP "\fB/var/spool/bitspool/\fR" 1.0i 0 Configured (via exit files) .SM `Spool-Dir:' under which local recipients will get their own subdirectories.. diff --git a/man/funetnje.8.ps b/man/funetnje.8.ps index 44508a15f7d12f56b497521ab68ffcbe6ccdbd71..66f82d442b4bc68ef1044e65443ea4f9796e5d0d 100644 GIT binary patch delta 32 kcmZpCz}WbJaf78XQ(59PwS{+2MjEWEi0L7~da{vGU delta 32 kcmZpCz}WbJaf78XQ)%&JYh!&NwK>PwS{+2MjEWEi0LWnrrT_o{ diff --git a/man/qrdr.8 b/man/qrdr.8 index 17366e3..7d3a545 100644 --- a/man/qrdr.8 +++ b/man/qrdr.8 @@ -50,7 +50,7 @@ effective uid. Spool directory is determined using same mechanism as in .I funetnje main program. Sample configuration of file procesing exits gives directory -.RI ` /usr/spool/bitspool ' +.RI ` /var/spool/bitspool ' in which UPPERCASE userids (or pseudoids - MAILER is one such) are `user' specific subdirectories containing individual spooled files. .LP @@ -72,7 +72,7 @@ output for user .LP .nf .fz 4 -2 -\f4QRDR: Spool dir: `/usr/spool/bitspool/MEA/' +\f4QRDR: Spool dir: `/var/spool/bitspool/MEA/' \f4From: To: FName: FExt: Type Form: SpoolID \f4NETSERV@FINHUT MEA@FINFILES NETSERV NOTE PUN A QUFINHUT 0002 \f4NETSERV@FINHUT MEA@FINFILES NETSERV NOTE PUN A QUFINHUT 0004 diff --git a/man/qrdr.8.ps b/man/qrdr.8.ps index f56a9636d0b7b5704d810d4a37718a4a3223ee11..905292a64926d9d02992008c3741dd630c798d1d 100644 GIT binary patch delta 23 ccmeAV>JQrRLYk>8aq}zbCrlvvf}A}U0DT1sumAu6 delta 23 ccmeAV>JQrRLYk?xc=IdiCrlvvf}A}U0De~q(f|Me