diff options
Diffstat (limited to 'net/citadel/files')
| -rw-r--r-- | net/citadel/files/patch-aa | 102 | ||||
| -rw-r--r-- | net/citadel/files/patch-ab | 31 | ||||
| -rw-r--r-- | net/citadel/files/patch-ac | 48 | ||||
| -rw-r--r-- | net/citadel/files/patch-ad | 21 | ||||
| -rw-r--r-- | net/citadel/files/patch-ae | 21 | ||||
| -rw-r--r-- | net/citadel/files/patch-af | 14 | ||||
| -rw-r--r-- | net/citadel/files/patch-ag | 26 | ||||
| -rw-r--r-- | net/citadel/files/patch-ah | 18 | ||||
| -rw-r--r-- | net/citadel/files/patch-ai | 55 | ||||
| -rw-r--r-- | net/citadel/files/patch-aj | 18 | ||||
| -rw-r--r-- | net/citadel/files/patch-ak | 12 | ||||
| -rw-r--r-- | net/citadel/files/patch-al | 11 |
12 files changed, 377 insertions, 0 deletions
diff --git a/net/citadel/files/patch-aa b/net/citadel/files/patch-aa new file mode 100644 index 000000000000..4284d79e12f6 --- /dev/null +++ b/net/citadel/files/patch-aa @@ -0,0 +1,102 @@ +--- Makefile.in.orig Mon Jul 2 23:07:06 2001 ++++ Makefile.in Mon Sep 10 11:00:50 2001 +@@ -24,7 +24,7 @@ + CX=@CX@ + + CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT) +-SERVER_TARGETS=citserver setup $(CHKPWD) ++SERVER_TARGETS=citserver citsetup $(CHKPWD) + SERV_MODULES=modules/serv_chat$(SO) modules/serv_vcard$(SO) \ + modules/serv_upgrade$(SO) \ + modules/serv_smtp$(SO) \ +@@ -224,8 +224,8 @@ + mailinglist: mailinglist.o config.o internetmail.o + $(CC) mailinglist.o config.o internetmail.o $(LDFLAGS) -o mailinglist + +-setup: setup.o tools.o +- $(CC) setup.o tools.o $(CURSES) $(NETLIBS) $(LDFLAGS) -o setup ++citsetup: setup.o tools.o ++ $(CC) setup.o tools.o $(CURSES) $(NETLIBS) $(LDFLAGS) -o citsetup + + chkpwd: chkpwd.o auth.o config.o + $(CC) chkpwd.o auth.o config.o $(LDFLAGS) -o chkpwd $(chkpwd_LIBS) +@@ -269,45 +269,60 @@ + install-data: + @for i in help messages network/spoolin network/spoolout \ + network/systems; do \ +- $(srcdir)/mkinstalldirs $(root)$(prefix)/$$i; \ ++ $(srcdir)/mkinstalldirs $(root)$(prefix)/share/citadel/$$i; \ + done + @for i in citadel.rc public_clients \ + `find $(srcdir)/help $(srcdir)/messages $(srcdir)/network -type f | grep -v CVS`; do \ +- echo $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \ +- $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \ ++ echo $(INSTALL_DATA) $$i $(root)$(prefix)/share/citadel/$$i; \ ++ $(INSTALL_DATA) $$i $(root)$(prefix)/share/citadel/$$i; \ + done + -@if test -d $(root)/etc/pam.d; then \ +- echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(root)/etc/pam.d/citadel; \ +- $(INSTALL_DATA) $(srcdir)/citadel.pam $(root)/etc/pam.d/citadel; \ ++ echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(root)$(prefix)/etc/pam.d/citadel; \ ++ $(INSTALL_DATA) $(srcdir)/citadel.pam $(root)$(prefix)/etc/pam.d/citadel; \ + fi + + install-doc: +- @$(srcdir)/mkinstalldirs $(root)$(prefix)/techdoc ++ @$(srcdir)/mkinstalldirs $(root)$(prefix)/share/doc/citadel/techdoc + @for i in `find $(srcdir)/techdoc -type f | grep -v CVS`; do \ +- echo $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \ +- $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \ ++ echo $(INSTALL_DATA) $$i $(root)$(prefix)/share/doc/citadel/$$i; \ ++ $(INSTALL_DATA) $$i $(root)$(prefix)/share/doc/citadel/$$i; \ ++ done ++ @$(srcdir)/mkinstalldirs $(root)$(prefix)/share/doc/citadel/docs ++ @for i in `find $(srcdir)/docs -type f | grep -v CVS`; do \ ++ echo $(INSTALL_DATA) $$i $(root)$(prefix)/share/doc/citadel/$$i; \ ++ $(INSTALL_DATA) $$i $(root)$(prefix)/share/doc/citadel/$$i; \ + done + + install-exec: all weekly +- @for i in bio bitbucket files images info modules userpics; do \ +- $(srcdir)/mkinstalldirs $(root)$(prefix)/$$i; \ ++ @for i in bio bitbucket files images info modules userpics network/spoolin network/spoolout network/systems; do \ ++ $(srcdir)/mkinstalldirs $(root)$(prefix)/share/citadel/$$i; \ ++ done ++ @echo "This directory contains upload/download files." > $(root)$(prefix)/share/citadel/files/README ++ @for i in $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) ; do \ ++ if test -f $$i; then \ ++ echo $(INSTALL) $$i $(root)$(prefix)/bin/$$i; \ ++ $(INSTALL) $$i $(root)$(prefix)/bin/$$i; \ ++ fi \ + done +- @for i in $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) \ +- $(SERV_MODULES) ; do \ ++ @for i in $(SERV_MODULES) ; do \ + if test -f $$i; then \ +- echo $(INSTALL) $$i $(root)$(prefix)/$$i; \ +- $(INSTALL) $$i $(root)$(prefix)/$$i; \ ++ echo $(INSTALL) $$i $(root)$(prefix)/share/citadel/$$i; \ ++ $(INSTALL) $$i $(root)$(prefix)/share/citadel/$$i; \ + fi \ + done + @for i in utilsmenu weekly dnetsetup; do \ + if test -f $(srcdir)/$$i; then \ +- echo $(INSTALL) $(srcdir)/$$i $(root)$(prefix)/$$i; \ +- $(INSTALL) $(srcdir)/$$i $(root)$(prefix)/$$i; \ ++ echo $(INSTALL) $(srcdir)/$$i $(root)$(prefix)/bin/$$i; \ ++ $(INSTALL) $(srcdir)/$$i $(root)$(prefix)/bin/$$i; \ + fi \ + done +- @if test x`find $(root)$(prefix)/chkpwd -user root` = x$(root)$(prefix)/chkpwd; then \ +- echo chmod u+s $(root)$(prefix)/chkpwd; \ +- chmod u+s $(root)$(prefix)/chkpwd; \ ++ echo $(srcdir)/mkinstalldirs $(root)$(prefix)/etc/rc.d ++ $(srcdir)/mkinstalldirs $(root)$(prefix)/etc/rc.d ++ echo $(INSTALL) $(srcdir)/rc-startup-citadel.sh $(root)$(prefix)/etc/rc.d/citadel.sh.example ++ $(INSTALL) $(srcdir)/rc-startup-citadel.sh $(root)$(prefix)/etc/rc.d/citadel.sh.example ++ @if test x`find $(root)$(prefix)/bin/chkpwd -user root` = x$(root)$(prefix)/bin/chkpwd; then \ ++ echo chmod u+s $(root)$(prefix)/bin/chkpwd; \ ++ chmod u+s $(root)$(prefix)/bin/chkpwd; \ + fi + + clean: diff --git a/net/citadel/files/patch-ab b/net/citadel/files/patch-ab new file mode 100644 index 000000000000..fdbacd600c48 --- /dev/null +++ b/net/citadel/files/patch-ab @@ -0,0 +1,31 @@ +*** configure.orig Tue Jun 12 17:04:41 2001 +--- configure Tue Jun 12 17:05:01 2001 +*************** +*** 536,547 **** + + if test "$prefix" = NONE; then + cat >> confdefs.h <<EOF +! #define BBSDIR "$ac_default_prefix" + EOF + + else + cat >> confdefs.h <<EOF +! #define BBSDIR "$prefix" + EOF + + fi +--- 536,549 ---- + + if test "$prefix" = NONE; then + cat >> confdefs.h <<EOF +! #define BBSDIR "$ac_default_prefix/share/citadel" +! #define BINDIR "$ac_default_prefix/bin" + EOF + + else + cat >> confdefs.h <<EOF +! #define BBSDIR "$prefix/share/citadel" +! #define BINDIR "$prefix/bin" + EOF + + fi diff --git a/net/citadel/files/patch-ac b/net/citadel/files/patch-ac new file mode 100644 index 000000000000..6a2bddd3574c --- /dev/null +++ b/net/citadel/files/patch-ac @@ -0,0 +1,48 @@ +*** setup.c.orig Tue Sep 5 14:35:25 2000 +--- setup.c Tue Jun 12 19:24:13 2001 +*************** +*** 59,71 **** + { + + "0", +! "Enter the full pathname of the directory in which the BBS you are", +! "creating or updating resides. If you specify a directory other than the", +! "default, you will need to specify the -h flag to the server when you start", +! "it up.", + + "1", +! "Enter the name of the system administrator (which is probably you).", + "When an account is created with this name, it will automatically be", + "assigned the highest access level.", + +--- 59,71 ---- + { + + "0", +! "Enter the full pathname to the directory which holds the configuration", +! "files for the BBS that you are creating or upgrading resides. If you", +! "specify a directory other than the default, you will need to specify", +! "the -h flag to the server when you start citserver.", + + "1", +! "Enter the account name of the system administrator (which is probably you).", + "When an account is created with this name, it will automatically be", + "assigned the highest access level.", + +*************** +*** 468,474 **** + char entryname[3]; + + /* Determine the fully qualified path name of citserver */ +! sprintf(looking_for, "%s/citserver ", BBSDIR); + + /* Pound through /etc/inittab line by line. Set have_entry to 1 if + * an entry is found which we believe starts citserver. +--- 468,474 ---- + char entryname[3]; + + /* Determine the fully qualified path name of citserver */ +! sprintf(looking_for, "%s/citserver ", BINDIR); + + /* Pound through /etc/inittab line by line. Set have_entry to 1 if + * an entry is found which we believe starts citserver. diff --git a/net/citadel/files/patch-ad b/net/citadel/files/patch-ad new file mode 100644 index 000000000000..9ba559d5cb63 --- /dev/null +++ b/net/citadel/files/patch-ad @@ -0,0 +1,21 @@ +*** user_ops.c.orig Tue Jun 12 19:25:41 2001 +--- user_ops.c Tue Jun 12 19:25:48 2001 +*************** +*** 434,441 **** + } + close(pipev[0]); + +! execl(BBSDIR "/chkpwd", BBSDIR "/chkpwd", NULL); +! perror(BBSDIR "/chkpwd"); + exit(1); + } + +--- 434,441 ---- + } + close(pipev[0]); + +! execl(BINDIR "/chkpwd", BINDIR "/chkpwd", NULL); +! perror(BINDIR "/chkpwd"); + exit(1); + } + diff --git a/net/citadel/files/patch-ae b/net/citadel/files/patch-ae new file mode 100644 index 000000000000..480ba5e07f7a --- /dev/null +++ b/net/citadel/files/patch-ae @@ -0,0 +1,21 @@ +*** weekly.in.orig Tue Jun 12 19:27:37 2001 +--- weekly.in Tue Jun 12 19:27:06 2001 +*************** +*** 7,14 **** + # $Id: weekly.in,v 573.0 2000/09/05 18:35:25 ajc Exp $ + # + +! [ x$BBSDIR = x ] && BBSDIR=@prefix@ +! [ x$EXECDIR = x ] && EXECDIR=$BBSDIR + + cd $BBSDIR || exit + +--- 7,14 ---- + # $Id: weekly.in,v 573.0 2000/09/05 18:35:25 ajc Exp $ + # + +! [ x$BBSDIR = x ] && BBSDIR=@prefix@/share/citadel +! [ x$EXECDIR = x ] && EXECDIR=@prefix@/bin + + cd $BBSDIR || exit + diff --git a/net/citadel/files/patch-af b/net/citadel/files/patch-af new file mode 100644 index 000000000000..f8cfca7cae3b --- /dev/null +++ b/net/citadel/files/patch-af @@ -0,0 +1,14 @@ +*** sysdep.h.in.orig Tue Jun 12 19:32:04 2001 +--- sysdep.h.in Tue Jun 12 19:32:28 2001 +*************** +*** 36,41 **** +--- 36,44 ---- + /* define this to the bbs home directory */ + #undef BBSDIR + ++ /* define this to the Citadel/UX binaries directory */ ++ #undef BINDIR ++ + /* define this to enable the autologin feature */ + #undef ENABLE_AUTOLOGIN + diff --git a/net/citadel/files/patch-ag b/net/citadel/files/patch-ag new file mode 100644 index 000000000000..9647dab77248 --- /dev/null +++ b/net/citadel/files/patch-ag @@ -0,0 +1,26 @@ +*** rc-startup-citadel.sh.orig Wed Jun 13 08:53:57 2001 +--- rc-startup-citadel.sh Wed Jun 13 08:56:43 2001 +*************** +*** 0 **** +--- 1,21 ---- ++ #!/bin/sh ++ ++ PREFIX=/usr/local ++ LOGTO=/var/log/citadel.log ++ ++ case $1 in ++ [Ss][Tt][Aa][Rr][Tt]) ++ if [ -x "${PREFIX}/bin/citserver" ]; then ++ ${PREFIX}/bin/citserver -t${LOGTO} -d ++ echo -n " Citadel/UX" ++ fi ++ ;; ++ ++ [Ss][Tt][Oo][Pp]) ++ ps -auxwww | grep citserver | grep -v grep | awk '{print $2}' | xargs kill ++ ;; ++ ++ *) ++ echo "Usage: $0 [start|stop]" ++ ;; ++ esac diff --git a/net/citadel/files/patch-ah b/net/citadel/files/patch-ah new file mode 100644 index 000000000000..db2f34a3be62 --- /dev/null +++ b/net/citadel/files/patch-ah @@ -0,0 +1,18 @@ +*** sysdep.c.orig Tue Sep 5 14:35:25 2000 +--- sysdep.c Wed Jun 13 09:32:44 2001 +*************** +*** 35,42 **** +--- 35,47 ---- + #include <stdarg.h> + #include <syslog.h> + #include <grp.h> ++ #if (defined(__unix__) || defined(unix)) && !defined(USG) ++ #include <sys/param.h> ++ #endif ++ #if !defined(BSD) + #ifdef __GNUC__ + #include <malloc.h> ++ #endif + #endif + #ifdef HAVE_PTHREAD_H + #include <pthread.h> diff --git a/net/citadel/files/patch-ai b/net/citadel/files/patch-ai new file mode 100644 index 000000000000..b97c23e33cf0 --- /dev/null +++ b/net/citadel/files/patch-ai @@ -0,0 +1,55 @@ +*** netmailer.c.orig Wed Jun 13 09:37:35 2001 +--- netmailer.c Wed Jun 13 09:39:48 2001 +*************** +*** 201,212 **** + char subject[256]; + time_t mid_buf; + time_t now; + int mlist = 0; + + openlog("netmailer", LOG_PID, LOG_USER); + get_config(); + LoadInternetConfig(); +! strcpy(temp, tmpnam(NULL)); /* temp file name */ + + if ((argc < 2) || (argc > 3)) { + fprintf(stderr, "netmailer: usage: " +--- 201,213 ---- + char subject[256]; + time_t mid_buf; + time_t now; ++ int fh; + int mlist = 0; + + openlog("netmailer", LOG_PID, LOG_USER); + get_config(); + LoadInternetConfig(); +! /* strcpy(temp, tmpnam(NULL)); /* temp file name */ + + if ((argc < 2) || (argc > 3)) { + fprintf(stderr, "netmailer: usage: " +*************** +*** 223,231 **** + mlist = 1; + } + /* convert to ASCII & get info */ +! fp = fopen(temp, "w"); + msgform(argv[1], fp, sbuf, rbuf, nbuf, pbuf, &mid_buf, rmname, subject); + fclose(fp); + + strcpy(buf, rmname); + strcpy(rmname, "room_"); +--- 224,236 ---- + mlist = 1; + } + /* convert to ASCII & get info */ +! /* fp = fopen(temp, "w"); */ +! fh = mkstemp( "/tmp/netmailer.XXXXXXXX" ); +! fp = fdopen( fh, "w" ); +! + msgform(argv[1], fp, sbuf, rbuf, nbuf, pbuf, &mid_buf, rmname, subject); + fclose(fp); ++ close(fh); + + strcpy(buf, rmname); + strcpy(rmname, "room_"); diff --git a/net/citadel/files/patch-aj b/net/citadel/files/patch-aj new file mode 100644 index 000000000000..038ca493f374 --- /dev/null +++ b/net/citadel/files/patch-aj @@ -0,0 +1,18 @@ +*** messages/goodbye.orig Tue Sep 5 15:08:12 2000 +--- messages/goodbye Wed Jun 13 10:44:19 2001 +*************** +*** 1,7 **** + +! < this logoff banner resides in ./messages/goodbye > +! +! Thanks for calling ^humannode - please call again soon! +! +! Also be sure to visit UNCENSORED! BBS at uncnsrd.mt-kisco.ny.us + +--- 1,6 ---- ++ Citadel/UX Communications Server - Powered by FreeBSD/i386 + +! < this logoff banner resides in PREFIX/share/citadel/messages/goodbye > +! +! Also be sure to visit UNCENSORED! BBS at uncensored.citadel.org + diff --git a/net/citadel/files/patch-ak b/net/citadel/files/patch-ak new file mode 100644 index 000000000000..08780b1dd494 --- /dev/null +++ b/net/citadel/files/patch-ak @@ -0,0 +1,12 @@ +*** messages/hello.orig Fri May 21 09:45:16 1999 +--- messages/hello Wed Jun 13 10:42:37 2001 +*************** +*** 1,3 **** + +! < this logon banner resides in ./messages/hello > +! +--- 1,4 ---- + +! < this logon banner resides in PREFIX/share/citadel/messages/hello > +! +! Citadel/UX Communications Server - Powered by FreeBSD/i386 diff --git a/net/citadel/files/patch-al b/net/citadel/files/patch-al new file mode 100644 index 000000000000..1ad3bc00fa56 --- /dev/null +++ b/net/citadel/files/patch-al @@ -0,0 +1,11 @@ +--- ipc_c_tcp.c.orig Mon Sep 10 10:45:23 2001 ++++ ipc_c_tcp.c Mon Sep 10 10:45:35 2001 +@@ -315,7 +315,7 @@ + + /* If we're using a unix domain socket we can do a bunch of stuff */ + if (!strcmp(cithost, UDS)) { +- sprintf(sockpath, "citadel.socket"); ++ sprintf(sockpath, "%s/citadel.socket", BBSDIR); + serv_sock = uds_connectsock(sockpath); + if (hostbuf != NULL) strcpy(hostbuf, cithost); + if (portbuf != NULL) strcpy(portbuf, sockpath); |