diff --git a/AUTHORS b/AUTHORS index d67670ad..f8325059 100644 --- a/AUTHORS +++ b/AUTHORS @@ -8,7 +8,7 @@ The following people are members of the MBSE BBS development team: Andrew Leary ajleary19@gmail.com 1:320/219@fidonet Vincent Coen vbcoen@gmail.com 2:250/1@fidonet Robert James Clay jame@rocasa.us 1:120/544@fidonet - +Sean Dennis sdennis72@gmail.com 1:18/200@fidonet All following people have contributed to the MBSE BBS project. I'm sure that people are missing from this list. The list is not in any special order. @@ -59,3 +59,4 @@ val khokhlov Robert Wolfe 1:116/18@fidonet Alan Ianson 1:153/757@fidonet Simon Voortman 2:280/1049.1@fidonet +Deon George 3:633/509@fidonet diff --git a/ChangeLog b/ChangeLog index e4af76cc..845a3bb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +v1.0.7.10 28-Sep-2018 - Andrew Leary + + 1. Updated the configuration file for using joe as the BBS + external editor to support current versions of joe. joe 4.2 + is now the minimum version supported; all releases up to and + including 4.6 have been tested and found to work. Thanks to + Deon George for the patch. + + 2. When creating a new Services database, mbsetup will now + include AreaFix and FileFix as known services, for the Areamgr + and Filemgr services respectively. Also fixed a bug that + caused the wrong number of records to be returned when creating + a new Services database. + + 3. Updated the Makefiles to install most of the BBS binaries + as read & execute only. Thanks to Deon George for the patch. + + 4. Added $DESTDIR support to the Makefiles, to make it easier + to build .DEB packages. This change should be transparent to + users building and installing MBSE. Thanks to Deon George for + the patch. + v1.0.7.9 17-Sep-2018 - Andrew Leary 1. Removed the requirement that incoming .TIC files have diff --git a/Makefile b/Makefile index 3edea350..93efe7e2 100644 --- a/Makefile +++ b/Makefile @@ -37,112 +37,111 @@ help: @echo "" install: - @./checkbasic @if [ "`id -un`" != "root" ] ; then \ echo; echo " Must be root to install!"; echo; exit 3; \ fi - @if [ -z ${PREFIX} ] ; then \ - echo; echo "PREFIX is not set!"; echo; exit 3; \ + @if [ -z ${DESTDIR}${PREFIX} ] ; then \ + echo; echo "[DESTDIR]PREFIX is not set!"; echo; exit 3; \ fi - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0755 ${PREFIX} - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${PREFIX}/bin - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${PREFIX}/etc - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/etc/dosemu - @if [ -f ${PREFIX}/etc/lastcall.data ] ; then \ - chmod 0660 ${PREFIX}/etc/lastcall.data ; \ + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0755 ${DESTDIR}${PREFIX} + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${DESTDIR}${PREFIX}/bin + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${DESTDIR}${PREFIX}/etc + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/etc/dosemu + @if [ -f ${DESTDIR}${PREFIX}/etc/lastcall.data ] ; then \ + chmod 0660 ${DESTDIR}${PREFIX}/etc/lastcall.data ; \ fi - @if [ -f ${PREFIX}/etc/sysinfo.data ] ; then \ - chmod 0660 ${PREFIX}/etc/sysinfo.data ; \ + @if [ -f ${DESTDIR}${PREFIX}/etc/sysinfo.data ] ; then \ + chmod 0660 ${DESTDIR}${PREFIX}/etc/sysinfo.data ; \ fi - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${PREFIX}/log - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${PREFIX}/tmp - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${PREFIX}/home - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0755 ${PREFIX}/share - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0755 ${PREFIX}/share/doc - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0755 ${PREFIX}/share/doc/html - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0755 ${PREFIX}/share/doc/tags - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/menus - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/menus/en - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/menus/es - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/menus/nl - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/menus/de - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/menus/gl - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/menus/zh - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/macro - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/macro/en - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/macro/es - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/macro/nl - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/macro/de - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/macro/gl - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/macro/zh - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/txtfiles - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/txtfiles/en - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/txtfiles/es - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/txtfiles/nl - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/txtfiles/de - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/txtfiles/gl - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/share/int/txtfiles/zh - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0775 ${PREFIX}/ftp - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0775 ${PREFIX}/ftp/pub - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0775 ${PREFIX}/ftp/pub/local - @${INSTALL} -d -o ${ROWNER} -g ${RGROUP} -m 0750 ${PREFIX}/ftp/incoming - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0775 ${PREFIX}/var - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/var/arealists - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/var/badtic - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${PREFIX}/var/boxes - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${PREFIX}/var/bso - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${PREFIX}/var/bso/outbound - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${PREFIX}/var/boxes - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${PREFIX}/var/dosemu - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${PREFIX}/var/dosemu/c - @if [ ! -d ${PREFIX}/var/fdb ] && [ -d ${PREFIX}/fdb ]; then \ + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${DESTDIR}${PREFIX}/log + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${DESTDIR}${PREFIX}/tmp + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${DESTDIR}${PREFIX}/home + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0755 ${DESTDIR}${PREFIX}/share + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0755 ${DESTDIR}${PREFIX}/share/doc + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0755 ${DESTDIR}${PREFIX}/share/doc/html + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0755 ${DESTDIR}${PREFIX}/share/doc/tags + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/menus + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/menus/en + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/menus/es + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/menus/nl + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/menus/de + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/menus/gl + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/menus/zh + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/macro + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/macro/en + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/macro/es + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/macro/nl + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/macro/de + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/macro/gl + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/macro/zh + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/txtfiles + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/txtfiles/en + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/txtfiles/es + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/txtfiles/nl + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/txtfiles/de + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/txtfiles/gl + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/share/int/txtfiles/zh + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0775 ${DESTDIR}${PREFIX}/ftp + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0775 ${DESTDIR}${PREFIX}/ftp/pub + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0775 ${DESTDIR}${PREFIX}/ftp/pub/local + @${INSTALL} -d -o ${ROWNER} -g ${RGROUP} -m 0750 ${DESTDIR}${PREFIX}/ftp/incoming + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0775 ${DESTDIR}${PREFIX}/var + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/var/arealists + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/var/badtic + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${DESTDIR}${PREFIX}/var/boxes + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${DESTDIR}${PREFIX}/var/bso + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${DESTDIR}${PREFIX}/var/bso/outbound + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${DESTDIR}${PREFIX}/var/boxes + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${DESTDIR}${PREFIX}/var/dosemu + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${DESTDIR}${PREFIX}/var/dosemu/c + @if [ ! -d ${DESTDIR}${PREFIX}/var/fdb ] && [ -d ${DESTDIR}${PREFIX}/fdb ]; then \ echo "Migrate files database..." ; \ - ${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${PREFIX}/var/fdb ; \ - mv ${PREFIX}/fdb/file*.data ${PREFIX}/var/fdb ; \ - echo "...done. You may remove ${PREFIX}/fdb" ; \ + ${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${DESTDIR}${PREFIX}/var/fdb ; \ + mv ${DESTDIR}${PREFIX}/fdb/file*.data ${DESTDIR}${PREFIX}/var/fdb ; \ + echo "...done. You may remove ${DESTDIR}${PREFIX}/fdb" ; \ fi - @if [ ! -d ${PREFIX}/var/magic ] && [ -d ${PREFIX}/magic ]; then \ + @if [ ! -d ${DESTDIR}${PREFIX}/var/magic ] && [ -d ${DESTDIR}${PREFIX}/magic ]; then \ echo "Migrate magic filenames..." ; \ - ${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/var/magic ; \ - mv ${PREFIX}/magic/* ${PREFIX}/var/magic ; \ - rmdir ${PREFIX}/magic ; \ + ${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/var/magic ; \ + mv ${DESTDIR}${PREFIX}/magic/* ${DESTDIR}${PREFIX}/var/magic ; \ + rmdir ${DESTDIR}${PREFIX}/magic ; \ echo "...done." ; \ fi - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${PREFIX}/var/fdb - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/var/hatch - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/var/inbound - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/var/magic - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${PREFIX}/var/mail - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${PREFIX}/var/msgs - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/var/nodelist - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/var/queue - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${PREFIX}/var/rules - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${PREFIX}/var/run - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0775 ${PREFIX}/var/sema - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/var/ticqueue - @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${PREFIX}/var/unknown - @chmod 0775 ${PREFIX}/var - @chmod 0775 ${PREFIX}/var/sema + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${DESTDIR}${PREFIX}/var/fdb + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/var/hatch + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/var/inbound + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/var/magic + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${DESTDIR}${PREFIX}/var/mail + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${DESTDIR}${PREFIX}/var/msgs + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/var/nodelist + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/var/queue + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${DESTDIR}${PREFIX}/var/rules + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0770 ${DESTDIR}${PREFIX}/var/run + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0775 ${DESTDIR}${PREFIX}/var/sema + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/var/ticqueue + @${INSTALL} -d -o ${OWNER} -g ${GROUP} -m 0750 ${DESTDIR}${PREFIX}/var/unknown + @chmod 0775 ${DESTDIR}${PREFIX}/var + @chmod 0775 ${DESTDIR}${PREFIX}/var/sema @if [ -x ${BINDIR}/mbtelnetd ]; then \ rm ${BINDIR}/mbtelnetd ; \ echo "removed ${BINDIR}/mbtelnetd"; \ fi @for d in ${SUBDIRS}; do (cd $$d && ${MAKE} -w $@) || exit; done - @if [ -d ${PREFIX}/doc ] ; then \ - echo; echo "If there is nothing important in ${PREFIX}/doc" ; \ + @if [ -d ${DESTDIR}${PREFIX}/doc ] ; then \ + echo; echo "If there is nothing important in ${DESTDIR}${PREFIX}/doc" ; \ echo "you may remove that obsolete directory." ; \ fi @for d in de en es fr gl it nl; do \ - if [ -d ${PREFIX}/share/int/$$d ] ; then \ - rmdir ${PREFIX}/share/int/$$d ; \ - echo "Removed directory ${PREFIX}/share/int/$$d" ; \ + if [ -d ${DESTDIR}${PREFIX}/share/int/$$d ] ; then \ + rmdir ${DESTDIR}${PREFIX}/share/int/$$d ; \ + echo "Removed directory ${DESTDIR}${PREFIX}/share/int/$$d" ; \ fi ; \ done - @rm -f ${PREFIX}/etc/charset.bin - @rm -f ${PREFIX}/bin/mbcharsetc - @rm -rf ${PREFIX}/sema - @rm -rf ${PREFIX}/tmp/arc + @rm -f ${DESTDIR}${PREFIX}/etc/charset.bin + @rm -f ${DESTDIR}${PREFIX}/bin/mbcharsetc + @rm -rf ${DESTDIR}${PREFIX}/sema + @rm -rf ${DESTDIR}${PREFIX}/tmp/arc dist tar: ${TARFILE} diff --git a/configure b/configure index f4762201..eb5a34b6 100755 --- a/configure +++ b/configure @@ -2309,7 +2309,7 @@ SUBDIRS="lib mbcico mbfido mbmon mbsebbs mbutils mbnntp mbtask mbsetup unix lang PACKAGE="mbsebbs" MAJOR="1" MINOR="0" -REVISION="7.9" +REVISION="7.10" VERSION="$MAJOR.$MINOR.$REVISION" COPYRIGHT="Copyright (C) 1997-2018 MBSE Development Team, All Rights Reserved" SHORTRIGHT="Copyright (C) 1997-2018 MBSE DevTm" diff --git a/configure.ac b/configure.ac index 93464c19..76d2a0ae 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_SUBST(SUBDIRS) PACKAGE="mbsebbs" MAJOR="1" MINOR="0" -REVISION="7.9" +REVISION="7.10" VERSION="$MAJOR.$MINOR.$REVISION" COPYRIGHT="Copyright (C) 1997-2018 MBSE Development Team, All Rights Reserved" SHORTRIGHT="Copyright (C) 1997-2018 MBSE DevTm" diff --git a/examples/Makefile b/examples/Makefile index 6d38c4e7..e675cdf5 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -32,52 +32,52 @@ help: @echo "You may replace the word english above with spanish, german or dutch" english-menus: - @tar xfC menus-en.tar ${PREFIX}/share/int/menus/en + @tar xfC menus-en.tar ${DESTDIR}${PREFIX}/share/int/menus/en @echo "Installed default English menus" english-txtfiles: - @tar xfC txtfiles-en.tar ${PREFIX}/share/int/txtfiles/en + @tar xfC txtfiles-en.tar ${DESTDIR}${PREFIX}/share/int/txtfiles/en @echo "Installed default English txtfiles" english-macros: - @tar xfC templates-en.tar ${PREFIX}/share/int/macro/en + @tar xfC templates-en.tar ${DESTDIR}${PREFIX}/share/int/macro/en @echo "Installed default English macro files" english: english-menus english-macros english-txtfiles spanish-menus: - @tar xfC menus-es.tar ${PREFIX}/share/int/menus/es + @tar xfC menus-es.tar ${DESTDIR}${PREFIX}/share/int/menus/es @echo "Installed default Spanish menus" spanish-txtfiles: - @tar xfC txtfiles-es.tar ${PREFIX}/share/int/txtfiles/es + @tar xfC txtfiles-es.tar ${DESTDIR}${PREFIX}/share/int/txtfiles/es @echo "Installed default Spanish txtfiles" spanish-macros: - @tar xfC templates-es.tar ${PREFIX}/share/int/macro/es + @tar xfC templates-es.tar ${DESTDIR}${PREFIX}/share/int/macro/es @echo "Installed default Spanish macro files" spanish: spanish-menus spanish-txtfiles spanish-macros german-menus: - @tar xfC menus-de.tar ${PREFIX}/share/int/menus/de + @tar xfC menus-de.tar ${DESTDIR}${PREFIX}/share/int/menus/de @echo "Installed default German menus" german-txtfiles: - @tar xfC txtfiles-de.tar ${PREFIX}/share/int/txtfiles/de + @tar xfC txtfiles-de.tar ${DESTDIR}${PREFIX}/share/int/txtfiles/de @echo "Installed default German txtfiles" german-macros: - @tar xfC templates-de.tar ${PREFIX}/share/int/macro/de + @tar xfC templates-de.tar ${DESTDIR}${PREFIX}/share/int/macro/de @echo "Installed default German macro files" german: german-menus german-txtfiles german-macros dutch-macros: - @tar xfC templates-nl.tar ${PREFIX}/share/int/macro/nl + @tar xfC templates-nl.tar ${DESTDIR}${PREFIX}/share/int/macro/nl @echo "Installed default Dutch macro files" dutch: dutch-macros @@ -91,24 +91,24 @@ macros: english-macros spanish-macros german-macros dutch-macros install: - @if [ ! -f ${ETCDIR}/header.txt ]; then \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 header.txt ${ETCDIR} ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 header.txt ${ETCDIR}" ; \ + @if [ ! -f ${DESTDIR}${ETCDIR}/header.txt ]; then \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 header.txt ${DESTDIR}${ETCDIR} ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 header.txt ${DESTDIR}${ETCDIR}" ; \ fi - @if [ ! -f ${ETCDIR}/footer.txt ]; then \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 footer.txt ${ETCDIR} ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 footer.txt ${ETCDIR}" ; \ + @if [ ! -f ${DESTDIR}${ETCDIR}/footer.txt ]; then \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 footer.txt ${DESTDIR}${ETCDIR} ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 footer.txt ${DESTDIR}${ETCDIR}" ; \ fi - @if [ ! -f ${PREFIX}/share/int/menus/en/main.mnu ]; then ${MAKE} -s english-menus ; fi - @if [ ! -f ${PREFIX}/share/int/txtfiles/en/main.ans ]; then ${MAKE} -s english-txtfiles ; fi - @if [ ! -f ${PREFIX}/share/int/macro/en/html.tic ]; then ${MAKE} -s english-macros ; fi - @if [ ! -f ${PREFIX}/share/int/menus/es/main.mnu ]; then ${MAKE} -s spanish-menus ; fi - @if [ ! -f ${PREFIX}/share/int/txtfiles/es/main.ans ]; then ${MAKE} -s spanish-txtfiles ; fi - @if [ ! -f ${PREFIX}/share/int/macro/es/html.tic ]; then ${MAKE} -s spanish-macros ; fi - @if [ ! -f ${PREFIX}/share/int/menus/de/main.mnu ]; then ${MAKE} -s german-menus ; fi - @if [ ! -f ${PREFIX}/share/int/txtfiles/de/main.ans ]; then ${MAKE} -s german-txtfiles ; fi - @if [ ! -f ${PREFIX}/share/int/macro/de/html.tic ]; then ${MAKE} -s german-macros ; fi - @if [ ! -f ${PREFIX}/share/int/macro/nl/html.tic ]; then ${MAKE} -s dutch-macros ; fi + @if [ ! -f ${DESTDIR}${PREFIX}/share/int/menus/en/main.mnu ]; then ${MAKE} -s english-menus ; fi + @if [ ! -f ${DESTDIR}${PREFIX}/share/int/txtfiles/en/main.ans ]; then ${MAKE} -s english-txtfiles ; fi + @if [ ! -f ${DESTDIR}${PREFIX}/share/int/macro/en/html.tic ]; then ${MAKE} -s english-macros ; fi + @if [ ! -f ${DESTDIR}${PREFIX}/share/int/menus/es/main.mnu ]; then ${MAKE} -s spanish-menus ; fi + @if [ ! -f ${DESTDIR}${PREFIX}/share/int/txtfiles/es/main.ans ]; then ${MAKE} -s spanish-txtfiles ; fi + @if [ ! -f ${DESTDIR}${PREFIX}/share/int/macro/es/html.tic ]; then ${MAKE} -s spanish-macros ; fi + @if [ ! -f ${DESTDIR}${PREFIX}/share/int/menus/de/main.mnu ]; then ${MAKE} -s german-menus ; fi + @if [ ! -f ${DESTDIR}${PREFIX}/share/int/txtfiles/de/main.ans ]; then ${MAKE} -s german-txtfiles ; fi + @if [ ! -f ${DESTDIR}${PREFIX}/share/int/macro/de/html.tic ]; then ${MAKE} -s german-macros ; fi + @if [ ! -f ${DESTDIR}${PREFIX}/share/int/macro/nl/html.tic ]; then ${MAKE} -s dutch-macros ; fi clean: rm -f *.h~ *.c~ core filelist Makefile.bak diff --git a/html/Makefile b/html/Makefile index 33db3dc0..2698db07 100644 --- a/html/Makefile +++ b/html/Makefile @@ -85,33 +85,33 @@ FILES = $(H_IN) $(H_BASE) $(H_FTSC) $(H_IMAGES) $(H_LICENSE) $(H_MENUS) $(H_MIS all depend clean depend: install: - @echo "Installing html documentation in ${PREFIX}/html" - @rm -Rf ${PREFIX}/html - @mkdir -p ${PREFIX}/html - @mkdir -p ${PREFIX}/html/ftsc - @mkdir -p ${PREFIX}/html/images - @mkdir -p ${PREFIX}/html/license - @mkdir -p ${PREFIX}/html/menus - @mkdir -p ${PREFIX}/html/misc - @mkdir -p ${PREFIX}/html/programs - @mkdir -p ${PREFIX}/html/setup - @${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/html - @${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/html/ftsc - @${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/html/images - @${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/html/license - @${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/html/menus - @${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/html/misc - @${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/html/programs - @${CHOWN} ${OWNER}:${GROUP} ${PREFIX}/html/setup - @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_BASE} ${PREFIX}/html - @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_OTHER} ${PREFIX}/html - @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_FTSC} ${PREFIX}/html/ftsc - @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_IMAGES} ${PREFIX}/html/images - @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_LICENSE} ${PREFIX}/html/license - @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_MENUS} ${PREFIX}/html/menus - @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_MISC} ${PREFIX}/html/misc - @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_PROGS} ${PREFIX}/html/programs - @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_SETUP} ${PREFIX}/html/setup + @echo "Installing html documentation in ${DESTDIR}${PREFIX}/html" + @rm -Rf ${DESTDIR}${PREFIX}/html + @mkdir -p ${DESTDIR}${PREFIX}/html + @mkdir -p ${DESTDIR}${PREFIX}/html/ftsc + @mkdir -p ${DESTDIR}${PREFIX}/html/images + @mkdir -p ${DESTDIR}${PREFIX}/html/license + @mkdir -p ${DESTDIR}${PREFIX}/html/menus + @mkdir -p ${DESTDIR}${PREFIX}/html/misc + @mkdir -p ${DESTDIR}${PREFIX}/html/programs + @mkdir -p ${DESTDIR}${PREFIX}/html/setup + @${CHOWN} ${OWNER}:${GROUP} ${DESTDIR}${PREFIX}/html + @${CHOWN} ${OWNER}:${GROUP} ${DESTDIR}${PREFIX}/html/ftsc + @${CHOWN} ${OWNER}:${GROUP} ${DESTDIR}${PREFIX}/html/images + @${CHOWN} ${OWNER}:${GROUP} ${DESTDIR}${PREFIX}/html/license + @${CHOWN} ${OWNER}:${GROUP} ${DESTDIR}${PREFIX}/html/menus + @${CHOWN} ${OWNER}:${GROUP} ${DESTDIR}${PREFIX}/html/misc + @${CHOWN} ${OWNER}:${GROUP} ${DESTDIR}${PREFIX}/html/programs + @${CHOWN} ${OWNER}:${GROUP} ${DESTDIR}${PREFIX}/html/setup + @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_BASE} ${DESTDIR}${PREFIX}/html + @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_OTHER} ${DESTDIR}${PREFIX}/html + @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_FTSC} ${DESTDIR}${PREFIX}/html/ftsc + @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_IMAGES} ${DESTDIR}${PREFIX}/html/images + @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_LICENSE} ${DESTDIR}${PREFIX}/html/license + @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_MENUS} ${DESTDIR}${PREFIX}/html/menus + @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_MISC} ${DESTDIR}${PREFIX}/html/misc + @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_PROGS} ${DESTDIR}${PREFIX}/html/programs + @${INSTALL} -p -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_SETUP} ${DESTDIR}${PREFIX}/html/setup clean: rm -f filelist diff --git a/lang/Makefile b/lang/Makefile index ca71378f..0b4ef829 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -15,7 +15,7 @@ clean: rm -f core filelist Makefile.bak language.* install: ${LDAT} - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${LDAT} ${INTDIR} + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${LDAT} ${DESTDIR}${INTDIR} language.en: source.en ../mbutils/mblang language.en source.en diff --git a/lib/Makefile b/lib/Makefile index 52e36392..87ea85a0 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -83,7 +83,7 @@ libnodelist.a: ${NODELIST_OBJS} ${RANLIB} $@ install: all - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 nodelist.conf ${ETCDIR} + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 nodelist.conf ${DESTDIR}${ETCDIR} clean: rm -f ${TARGET} *.o *.h~ *.c~ ftscprod.c core filelist Makefile.bak diff --git a/mbcico/Makefile b/mbcico/Makefile index 7f56c9b9..d6b52538 100644 --- a/mbcico/Makefile +++ b/mbcico/Makefile @@ -46,10 +46,10 @@ clean: rm -f ${TARGET} *.o *.h~ *.c~ core filelist Makefile.bak install: all - ${INSTALL} -c -s -g ${GROUP} -o ${OWNER} -m 4750 mbcico ${BINDIR} - ${INSTALL} -c -s -g ${GROUP} -o ${OWNER} -m 0750 mbout ${BINDIR} - @rm -f ${BINDIR}/mbtelind - @rm -f ${BINDIR}/mbtelout + ${INSTALL} -c -s -g ${GROUP} -o ${OWNER} -m 4550 mbcico ${DESTDIR}${BINDIR} + ${INSTALL} -c -s -g ${GROUP} -o ${OWNER} -m 0550 mbout ${DESTDIR}${BINDIR} + @rm -f ${DESTDIR}${BINDIR}/mbtelind + @rm -f ${DESTDIR}${BINDIR}/mbtelout mbcico: ${MBCICO_OBJS} ${SLIBS} ${CC} -o mbcico ${MBCICO_OBJS} ${LDFLAGS} ${LIBS} ${SLIBS} diff --git a/mbfido/Makefile b/mbfido/Makefile index 50c04dba..b89e69b0 100644 --- a/mbfido/Makefile +++ b/mbfido/Makefile @@ -83,17 +83,17 @@ clean: rm -f ${TARGET} *.o *.h~ *.c~ core filelist Makefile.bak install: all - ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 4750 mbfido ${BINDIR} - ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0750 mbseq ${BINDIR} - ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0700 mbaff ${BINDIR} - ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0700 mbindex ${BINDIR} - ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0700 mbdiff ${BINDIR} - ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0700 mbfile ${BINDIR} - ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0750 mbmsg ${BINDIR} - rm -f ${BINDIR}/mbmail - ${LN_S} ${BINDIR}/mbfido ${BINDIR}/mbmail - rm -f ${BINDIR}/mbnews - ${LN_S} ${BINDIR}/mbfido ${BINDIR}/mbnews + ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 4550 mbfido ${DESTDIR}${BINDIR} + ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0550 mbseq ${DESTDIR}${BINDIR} + ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0500 mbaff ${DESTDIR}${BINDIR} + ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0500 mbindex ${DESTDIR}${BINDIR} + ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0500 mbdiff ${DESTDIR}${BINDIR} + ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0500 mbfile ${DESTDIR}${BINDIR} + ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0550 mbmsg ${DESTDIR}${BINDIR} + rm -f ${DESTDIR}${BINDIR}/mbmail + ${LN_S} ${BINDIR}/mbfido ${DESTDIR}${BINDIR}/mbmail + rm -f ${DESTDIR}${BINDIR}/mbnews + ${LN_S} ${BINDIR}/mbfido ${DESTDIR}${BINDIR}/mbnews filelist: Makefile BASE=`pwd`; \ diff --git a/mbmon/Makefile b/mbmon/Makefile index 8148536b..cb2008d8 100644 --- a/mbmon/Makefile +++ b/mbmon/Makefile @@ -25,7 +25,7 @@ clean: rm -f mbmon *.o *.h~ *.c~ core filelist Makefile.bak install: all - ${INSTALL} -c -s -g ${GROUP} -o ${OWNER} -m 0700 mbmon ${BINDIR} + ${INSTALL} -c -s -g ${GROUP} -o ${OWNER} -m 0500 mbmon ${DESTDIR}${BINDIR} filelist: Makefile BASE=`pwd`; \ diff --git a/mbnntp/Makefile b/mbnntp/Makefile index ada6be2c..c5eeed21 100644 --- a/mbnntp/Makefile +++ b/mbnntp/Makefile @@ -27,7 +27,7 @@ clean: rm -f mbnntp *.o *.h~ *.c~ core filelist Makefile.bak install: all - ${INSTALL} -c -s -g ${GROUP} -o ${OWNER} -m 4750 mbnntp ${BINDIR} + ${INSTALL} -c -s -g ${GROUP} -o ${OWNER} -m 4550 mbnntp ${DESTDIR}${BINDIR} filelist: Makefile BASE=`pwd`; \ diff --git a/mbsebbs/Makefile b/mbsebbs/Makefile index 24e3fa84..8a7a230f 100644 --- a/mbsebbs/Makefile +++ b/mbsebbs/Makefile @@ -58,9 +58,9 @@ install: all @if [ "`id -un`" != "root" ] ; then \ echo; echo " Must be root to install!"; echo; exit 3; \ fi - ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0750 mbsebbs ${BINDIR} - ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 6750 mbnewusr ${BINDIR} - @rm -f ${ETCDIR}/bbslist.data + ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0550 mbsebbs ${DESTDIR}${BINDIR} + ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 6550 mbnewusr ${DESTDIR}${BINDIR} + @rm -f ${DESTDIR}${ETCDIR}/bbslist.data filelist: Makefile BASE=`pwd`; \ diff --git a/mbsetup/Makefile b/mbsetup/Makefile index 061be445..d8ecfc1f 100644 --- a/mbsetup/Makefile +++ b/mbsetup/Makefile @@ -40,7 +40,7 @@ clean: rm -f mbsetup *.o *.h~ *.c~ core filelist Makefile.bak install: all - ${INSTALL} -c -s -g ${GROUP} -o ${OWNER} -m 0700 mbsetup ${BINDIR} + ${INSTALL} -c -s -g ${GROUP} -o ${OWNER} -m 0500 mbsetup ${DESTDIR}${BINDIR} filelist: Makefile BASE=`pwd`; \ diff --git a/mbsetup/m_service.c b/mbsetup/m_service.c index e6d7e743..ac92ba8c 100644 --- a/mbsetup/m_service.c +++ b/mbsetup/m_service.c @@ -73,6 +73,8 @@ int CountService(void) fwrite(&servrec, sizeof(servrec), 1, fil); snprintf(servrec.Service, 16, "fmail"); fwrite(&servrec, sizeof(servrec), 1, fil); + snprintf(servrec.Service, 16, "areafix"); + fwrite(&servrec, sizeof(servrec), 1, fil); servrec.Action = FILEMGR; snprintf(servrec.Service, 16, "filemgr"); @@ -83,9 +85,12 @@ int CountService(void) fwrite(&servrec, sizeof(servrec), 1, fil); snprintf(servrec.Service, 16, "raid"); fwrite(&servrec, sizeof(servrec), 1, fil); + snprintf(servrec.Service, 16, "filefix"); + fwrite(&servrec, sizeof(servrec), 1, fil); + fclose(fil); chmod(ffile, 0640); - return 6; + return 10; } else return -1; } diff --git a/mbtask/Makefile b/mbtask/Makefile index 5daff370..130cedd9 100644 --- a/mbtask/Makefile +++ b/mbtask/Makefile @@ -33,10 +33,10 @@ install: all @if [ "`id -un`" != "root" ] ; then \ echo; echo " Must be root to install!"; echo; exit 3; \ fi - ${INSTALL} -c -s -o ${ROWNER} -g ${RGROUP} -m 6711 mbtask ${BINDIR} - @if [ ! -f ${ETCDIR}/issue ]; then \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 issue ${ETCDIR} ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 issue ${ETCDIR}"; \ + ${INSTALL} -c -s -o ${ROWNER} -g ${RGROUP} -m 6511 mbtask ${DESTDIR}${BINDIR} + @if [ ! -f ${DESTDIR}${ETCDIR}/issue ]; then \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 issue ${DESTDIR}${ETCDIR} ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 issue ${DESTDIR}${ETCDIR}"; \ fi filelist: Makefile diff --git a/mbutils/Makefile b/mbutils/Makefile index 9f65a9cd..80fbd8ec 100644 --- a/mbutils/Makefile +++ b/mbutils/Makefile @@ -58,13 +58,13 @@ install: all @if [ "`id -un`" != "root" ] ; then \ echo; echo " Must be root to install!"; echo; exit 3; \ fi - ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0700 mball ${BINDIR} - ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0700 mblang ${BINDIR} - ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0750 mbstat ${BINDIR} - ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 4750 mbsnmp ${BINDIR} - ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0700 mbtoberep ${BINDIR} - ${INSTALL} -c -s -o ${ROWNER} -g ${RGROUP} -m 6711 mbuser ${BINDIR} - ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0750 mbbw ${BINDIR} + ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0500 mball ${DESTDIR}${BINDIR} + ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0500 mblang ${DESTDIR}${BINDIR} + ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0550 mbstat ${DESTDIR}${BINDIR} + ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 4550 mbsnmp ${DESTDIR}${BINDIR} + ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0500 mbtoberep ${DESTDIR}${BINDIR} + ${INSTALL} -c -s -o ${ROWNER} -g ${RGROUP} -m 6511 mbuser ${DESTDIR}${BINDIR} + ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0550 mbbw ${DESTDIR}${BINDIR} @rm -f mbchat filelist: Makefile diff --git a/script/Makefile b/script/Makefile index f35f137e..ca15cdd6 100644 --- a/script/Makefile +++ b/script/Makefile @@ -20,75 +20,77 @@ install: @if [ "`id -un`" != "root" ] ; then \ echo; echo " Must be root to install!"; echo; exit 3; \ fi - @if [ ! -x ${ETCDIR}/maint ]; then \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 maint ${ETCDIR} ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 maint ${ETCDIR}" ; \ + @if [ ! -x ${DESTDIR}${ETCDIR}/maint ]; then \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 maint ${DESTDIR}${ETCDIR} ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 maint ${DESTDIR}${ETCDIR}" ; \ else \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 maint ${ETCDIR}/maint.new ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 maint ${ETCDIR}/maint.new" ; \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 maint ${DESTDIR}${ETCDIR}/maint.new ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 maint ${DESTDIR}${ETCDIR}/maint.new" ; \ fi - @if [ ! -x ${ETCDIR}/midnight ]; then \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 midnight ${ETCDIR} ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 midnight ${ETCDIR}" ; \ + @if [ ! -x ${DESTDIR}${ETCDIR}/midnight ]; then \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 midnight ${DESTDIR}${ETCDIR} ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 midnight ${DESTDIR}${ETCDIR}" ; \ else \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 midnight ${ETCDIR}/midnight.new ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 midnight ${ETCDIR}/midnight.new" ; \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 midnight ${DESTDIR}${ETCDIR}/midnight.new ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 midnight ${DESTDIR}${ETCDIR}/midnight.new" ; \ fi - @if [ ! -x ${ETCDIR}/weekly ]; then \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 weekly ${ETCDIR} ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 weekly ${ETCDIR}" ; \ + @if [ ! -x ${DESTDIR}${ETCDIR}/weekly ]; then \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 weekly ${DESTDIR}${ETCDIR} ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 weekly ${DESTDIR}${ETCDIR}" ; \ else \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 weekly ${ETCDIR}/weekly.new ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 weekly ${ETCDIR}/weekly.new" ; \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 weekly ${DESTDIR}${ETCDIR}/weekly.new ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 weekly ${DESTDIR}${ETCDIR}/weekly.new" ; \ fi - @if [ ! -x ${ETCDIR}/monthly ]; then \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 monthly ${ETCDIR} ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 monthly ${ETCDIR}" ; \ + @if [ ! -x ${DESTDIR}${ETCDIR}/monthly ]; then \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 monthly ${DESTDIR}${ETCDIR} ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 monthly ${DESTDIR}${ETCDIR}" ; \ else \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 monthly ${ETCDIR}/monthly.new ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 monthly ${ETCDIR}/monthly.new" ; \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 monthly ${DESTDIR}${ETCDIR}/monthly.new ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 monthly ${DESTDIR}${ETCDIR}/monthly.new" ; \ fi - @if [ ! -x ${BINDIR}/hatch ]; then \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 hatch ${BINDIR} ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 hatch ${BINDIR}" ; \ + @if [ ! -x ${DESTDIR}${BINDIR}/hatch ]; then \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 hatch ${DESTDIR}${BINDIR} ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 hatch ${DESTDIR}${BINDIR}" ; \ else \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 hatch ${BINDIR}/hatch.new ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 hatch ${BINDIR}/hatch/new" ; \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 hatch ${DESTDIR}${BINDIR}/hatch.new ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 hatch ${DESTDIR}${BINDIR}/hatch/new" ; \ fi @if [ -x ${JOEBIN}/joe ]; then \ echo "Installing support for joe editor" ; \ - rm -f ${JOEBIN}/bbsjoe ; \ - rm -f ${JOEBIN}/bbsjmacs ; \ - echo "${LN_S} ${JOEBIN}/joe ${JOEBIN}/bbsjoe" ; \ - ${LN_S} ${JOEBIN}/joe ${JOEBIN}/bbsjoe ; \ - echo "${LN_S} ${JOEBIN}/joe ${JOEBIN}/bbsjmacs" ; \ - ${LN_S} ${JOEBIN}/joe ${JOEBIN}/bbsjmacs ; \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 editor ${BINDIR} ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 editor ${BINDIR}" ; \ + rm -f ${DESTDIR}${JOEBIN}/bbsjoe ; \ + rm -f ${DESTDIR}${JOEBIN}/bbsjmacs ; \ + mkdir -p ${DESTDIR}${JOEBIN} ; \ + echo "${LN_S} ${JOEBIN}/joe ${DESTDIR}${JOEBIN}/bbsjoe" ; \ + ${LN_S} ${JOEBIN}/joe ${DESTDIR}${JOEBIN}/bbsjoe ; \ + echo "${LN_S} ${JOEBIN}/joe ${DESTDIR}${JOEBIN}/bbsjmacs" ; \ + ${LN_S} ${JOEBIN}/joe ${DESTDIR}${JOEBIN}/bbsjmacs ; \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0550 editor ${DESTDIR}${BINDIR} ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0550 editor ${DESTDIR}${BINDIR}" ; \ fi @if [ -d ${JOELIB} ]; then \ - ${INSTALL} -c -o ${ROWNER} -g ${RGROUP} -m 0644 bbsjoerc ${JOELIB} ; \ - echo "${INSTALL} -c -o ${ROWNER} -g ${RGROUP} -m 0644 bbsjoerc ${JOELIB}" ; \ - ${INSTALL} -c -o ${ROWNER} -g ${RGROUP} -m 0644 bbsjmacsrc ${JOELIB} ; \ - echo "${INSTALL} -c -o ${ROWNER} -g ${RGROUP} -m 0644 bbsjmacsrc ${JOELIB}" ; \ + mkdir -p ${DESTDIR}${JOELIB} ; \ + ${INSTALL} -c -o ${ROWNER} -g ${RGROUP} -m 0644 bbsjoerc ${DESTDIR}${JOELIB} ; \ + echo "${INSTALL} -c -o ${ROWNER} -g ${RGROUP} -m 0644 bbsjoerc ${DESTDIR}${JOELIB}" ; \ + ${INSTALL} -c -o ${ROWNER} -g ${RGROUP} -m 0644 bbsjmacsrc ${DESTDIR}${JOELIB} ; \ + echo "${INSTALL} -c -o ${ROWNER} -g ${RGROUP} -m 0644 bbsjmacsrc ${DESTDIR}${JOELIB}" ; \ fi - @if [ ! -x ${BINDIR}/bbsdoor.sh ]; then \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 bbsdoor.sh ${BINDIR} ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 bbsdoor.sh ${BINDIR}" ; \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 rundoor.sh ${BINDIR} ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 rundoor.sh ${BINDIR}" ; \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 runvirtual.sh ${BINDIR} ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 runvirtual.sh ${BINDIR}" ; \ + @if [ ! -x ${DESTDIR}${BINDIR}/bbsdoor.sh ]; then \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 bbsdoor.sh ${DESTDIR}${BINDIR} ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 bbsdoor.sh ${DESTDIR}${BINDIR}" ; \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 rundoor.sh ${DESTDIR}${BINDIR} ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 rundoor.sh ${DESTDIR}${BINDIR}" ; \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 runvirtual.sh ${DESTDIR}${BINDIR} ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 runvirtual.sh ${DESTDIR}${BINDIR}" ; \ else \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 bbsdoor.sh ${BINDIR}/bbsdoor.sh.new ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 bbsdoor.sh ${BINDIR}/bbsdoor.sh.new" ; \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 rundoor.sh ${BINDIR}/rundoor.sh.new ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 rundoor.sh ${BINDIR}/rundoor.sh.new" ; \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 runvirtual.sh ${BINDIR}/runvirtual.sh.new ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 runvirtual.sh ${BINDIR}/runvirtual.sh.new" ; \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 bbsdoor.sh ${DESTDIR}${BINDIR}/bbsdoor.sh.new ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 bbsdoor.sh ${DESTDIR}${BINDIR}/bbsdoor.sh.new" ; \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 rundoor.sh ${DESTDIR}${BINDIR}/rundoor.sh.new ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 rundoor.sh ${DESTDIR}${BINDIR}/rundoor.sh.new" ; \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 runvirtual.sh ${DESTDIR}${BINDIR}/runvirtual.sh.new ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0750 runvirtual.sh ${DESTDIR}${BINDIR}/runvirtual.sh.new" ; \ fi - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0640 doors.bat ${VARDIR}/dosemu/c - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0700 mbsedos ${BINDIR} + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0640 doors.bat ${DESTDIR}${VARDIR}/dosemu/c + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0500 mbsedos ${DESTDIR}${BINDIR} @bash ./installinit.sh filelist: Makefile diff --git a/script/bbsjmacsrc b/script/bbsjmacsrc index f894bc52..b8a539ad 100644 --- a/script/bbsjmacsrc +++ b/script/bbsjmacsrc @@ -43,7 +43,7 @@ -lines nnn Set no. screen lines -baud nnn Set baud rate for terminal optimizations -columns nnn Set no. screen columns ---help Start with help on + -help Start with help on -skiptop 4 Don't use top nnn lines of the screen Status line definition strings. -lmsg defines the left-justified string and @@ -264,7 +264,7 @@ Macros may cross lines if they end with , :windows Bindings common to all windows -type ^@ TO ÿ Self insert +type U+0 TO U+10FFFF Self insert abort ^G Abort window abort ^X ^C abort ^C @@ -508,10 +508,39 @@ uparwmenu ^[ [ A uparwmenu ^[ O A :querysr Search & replace query window -type ^@ TO ÿ +type U+0 TO U+10FFFF :query Single-key query window :inherit windows :querya Single-key query window for quoting -type ^@ TO ÿ +type U+0 TO U+10FFFF + +:shell Input to shell windows +:inherit main +"C" ^C Abort +"D" ^D Eof +" " ^I Tab +"H" ^H Backspace +"M" ^M Return +"?" ^? Backspace + +:vtshell Input to ANSI shell windows +:inherit main +"[[A" [ [ A +"[[A" .ku +"[[B" [ [ B +"[[B" .kd +"[[C" [ [ C +"[[C" .kr +"[[D" [ [ D +"[[D" .kl +"A" ^A BOL for bash +"C" ^C Abort +"D" ^D Eof +"E" ^E EOL for bash +" " ^I Tab +"H" ^H Backspace +"M" ^M Return +"?" ^? Backspace + diff --git a/script/bbsjoerc b/script/bbsjoerc index 41d92950..1249d5dd 100644 --- a/script/bbsjoerc +++ b/script/bbsjoerc @@ -63,7 +63,7 @@ -columns nnn Set no. screen columns ---help Start with help on + -helpon Start with help on -skiptop 4 Don't use top nnn lines of the screen @@ -290,7 +290,7 @@ Macros may cross lines if they end with , :windows Bindings common to all windows -type ^@ TO ÿ Type a character +type U+0 TO U+10FFFF abort ^K q Abort window abort ^K Q abort ^K ^Q @@ -582,7 +582,36 @@ uparwmenu ^[ O A :inherit windows :querya Single-key query window for quoting -type ^@ TO ÿ +type U+0 TO U+10FFFF :querysr Search & replace query window -type ^@ TO ÿ +type U+0 TO U+10FFFF + +:shell Input to shell windows +:inherit main +"" ^C Abort +"" ^D Eof +" " ^I Tab +"" ^H Backspace +" " ^M Return +"" ^? Backspace + +:vtshell Input to ANSI shell windows +:inherit main +""  [ A +"" .ku +""  [ B +"" .kd +""  [ C +"" .kr +""  [ D +"" .kl +"" ^A BOL for bash +"" ^C Abort +"" ^D Eof +"" ^E EOL for bash +" " ^I Tab +"" ^H Backspace +" " ^M Return +"" ^? Backspace + diff --git a/unix/Makefile b/unix/Makefile index 4684c9ad..69348506 100644 --- a/unix/Makefile +++ b/unix/Makefile @@ -45,15 +45,15 @@ install: all @if [ "`id -un`" != "root" ] ; then \ echo; echo " Must be root to install!"; echo; exit 3; \ fi - ${INSTALL} -c -s -o ${ROWNER} -g ${RGROUP} -m 6711 mbuseradd ${BINDIR} - ${INSTALL} -c -s -o ${ROWNER} -g ${RGROUP} -m 6711 mbpasswd ${BINDIR} - ${INSTALL} -c -s -o ${ROWNER} -g ${RGROUP} -m 0755 mblogin ${BINDIR} - @if [ ! -f ${ETCDIR}/login.defs ] ; then \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 login.defs ${ETCDIR} ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 login.defs ${ETCDIR}" ; \ + ${INSTALL} -c -s -o ${ROWNER} -g ${RGROUP} -m 6511 mbuseradd ${DESTDIR}${BINDIR} + ${INSTALL} -c -s -o ${ROWNER} -g ${RGROUP} -m 6511 mbpasswd ${DESTDIR}${BINDIR} + ${INSTALL} -c -s -o ${ROWNER} -g ${RGROUP} -m 0555 mblogin ${DESTDIR}${BINDIR} + @if [ ! -f ${DESTDIR}${ETCDIR}/login.defs ] ; then \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 login.defs ${DESTDIR}${ETCDIR} ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 login.defs ${DESTDIR}${ETCDIR}" ; \ else \ - ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 login.defs ${ETCDIR}/login.defs.new ; \ - echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 login.defs ${ETCDIR}/login.defs.new" ; \ + ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 login.defs ${DESTDIR}${ETCDIR}/login.defs.new ; \ + echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 login.defs ${DESTDIR}${ETCDIR}/login.defs.new" ; \ fi filelist: Makefile