--- fbb-7.04j.orig/install_sh
+++ fbb-7.04j/install_sh
@@ -180,11 +180,11 @@
echo "FBB installation tool"
echo
echo "Warning ! This will replace binaries. Configuration files will not be replaced."
-echo -n "Go on anyway ? (Y/N) "
-read REP
-if [ "$REP" = "N" -o "$REP" = "n" ] ; then
- exit 0
-fi
+#echo -n "Go on anyway ? (Y/N) "
+#read REP
+#if [ "$REP" = "N" -o "$REP" = "n" ] ; then
+# exit 0
+#fi
echo
--- fbb-7.04j.orig/xfbbC.8
+++ fbb-7.04j/xfbbC.8
@@ -0,0 +1,62 @@
+.TH XFBBC 8
+.SH NAME
+xfbbC \- Console for the fbb mailbox
+.SH SYNOPSIS
+.B xfbbC
+.I "[options]"
+
+.SH DESCRIPTION
+This is the console client for the xfbbd BBS daemon.
+
+.SH OPTIONS
+.TP
+.B \-h
+Hostname address of the xfbbd server.
+.TP
+.B \-d
+Download remote configuration file.
+.TP
+.B \-u
+Upload configuration file.
+.TP
+.B \-l
+Display remote directory.
+.TP
+.B \-f
+Data filtering. Control characters are discarded.
+.TP
+.B \-p
+IP port number (default 3286).
+.TP
+.B \-w
+password of the callsign as defined in passwd.sys.
+.TP
+.B \-i
+Callsign used for connection.
+.TP
+.B \-c
+Console connection.
+.TP
+.B \-m
+Displays a connected channel (0 = all channels).
+.TP
+.B \-r
+Don't use ncurses.
+.TP
+.B \-s
+Request service number.
+
+.SH REMARKS
+Environment variables used by xfbbC are:
+.TP
+XFBBC_HOST : hostname (default localhost).
+.TP
+XFBBC_PORT : socket port (default 3286).
+.TP
+XFBBC_CALL : my callsign.
+.TP
+XFBBC_PASS : password string of passwd.sys in xfbbd.
+
+
+.SH AUTHOR
+This manual page was written by Joop Stakenborg .
--- fbb-7.04j.orig/fbb
+++ fbb-7.04j/fbb
@@ -231,7 +231,7 @@
echo "# FBB$VERSION"
echo "#"
echo "#Ports TNCs"
- echo " 1 $[ $NUMPORT - 1 ]"
+ echo " 1 $(( $NUMPORT - 1 ))"
echo "#"
echo "#Com Interface Adress (Hex) Baud"
echo " 1 9 0 9600"
@@ -241,7 +241,7 @@
while [ $NB -lt $NUMPORT ] ; do
printf " %-2s %-2s 1 %-6s 250 2 1 10 00/15 XUWYL %s\n"\
$NB ${NB_CH[$NB]} ${PORT_NAME[$NB]} ${PORT_FREQ[$NB]}
- NB=$[ $NB + 1 ]
+ NB=$(( $NB + 1 ))
done
echo "#"
echo "# End of file."
@@ -269,7 +269,7 @@
echo -n "Frequency : "
read REP
PORT_FREQ[$NUMPORT]=$REP
- NUMPORT=$[ $NUMPORT + 1 ]
+ NUMPORT=$(( $NUMPORT + 1 ))
done
NB=1
@@ -277,7 +277,7 @@
echo
while [ $NB -lt $NUMPORT ] ; do
echo "Port $NB on axport ${PORT_NAME[$NB]} (${NB_CH[$NB]} channels) Freq=${PORT_FREQ[$NB]}"
- NB=$[ $NB + 1 ]
+ NB=$(( $NB + 1 ))
done
while true ; do
@@ -307,7 +307,7 @@
echo "! MAIL" >> $FILE
echo "\$d \$Tz Mailbox \$O-\$o (LINUX version)" >> $FILE
fi
- NB=$[ $NB + 1 ]
+ NB=$(( $NB + 1 ))
done
fi
--- fbb-7.04j.orig/fbbgetconf.1
+++ fbb-7.04j/fbbgetconf.1
@@ -0,0 +1,25 @@
+.TH FBBGETCONF 1
+.SH NAME
+fbbgetconf \- Returns values from the fbb configuration
+.SH SYNOPSIS
+.B fbbgetconf
+.I "[options]"
+.I [key] [key] ...
+
+.SH OPTIONS
+.TP
+.B \-a
+List all values.
+.TP
+.B \-h
+Display a short help.
+.TP
+.B \-d
+List default values.
+.TP
+.B \-f [configfile]
+Use configfile.
+
+
+.SH AUTHOR
+This manual page was written by Joop Stakenborg .
--- fbb-7.04j.orig/fbb.8
+++ fbb-7.04j/fbb.8
@@ -0,0 +1,34 @@
+.TH FBB 8
+
+.SH NAME
+fbb \- Script to start the fbb daemon
+
+.SH SYNOPSIS
+.B fbb
+.I "[options]"
+
+.SH DESCRIPTION
+This script is used to start the daemon. It will ask you for configuration
+details (CALL, SSID, QRA, etc.) and port entries when the
+configuration file for fbb (/etc/ax25/fbb.conf) does not exist.
+If a configuration file is present the daemon will be started.
+
+.SH OPTIONS
+.TP
+.B \-f
+Runs fbb in foreground.
+.TP
+.B \-h
+Help information (only displayed when a valid configuration is present).
+.TP
+.B \-l
+Log debug info to logfile.
+.TP
+.B \-s
+Run fbb silently.
+.TP
+Any other flags will be passed to the daemon.
+
+
+.SH AUTHOR
+This manual page was written by Joop Stakenborg .
--- fbb-7.04j.orig/rc.fbb
+++ fbb-7.04j/rc.fbb
@@ -22,13 +22,13 @@
else
return=$rc_failed
fi
- echo -e "$return"
+ echo "$return"
;;
stop)
echo -n "Shutting down FBB daemon"
killproc -TERM /usr/sbin/fbb || return=$rc_failed
sleep 4
- echo -e "$return"
+ echo "$return"
;;
restart|reload)
$0 stop && $0 start || return=$rc_failed
--- fbb-7.04j.orig/Makefile
+++ fbb-7.04j/Makefile
@@ -0,0 +1,6 @@
+SUBDIRS = src
+
+all clean install:
+ for i in ${SUBDIRS} ; do \
+ ( cd $$i && ${MAKE} $@ ) || exit 1; \
+ done
--- fbb-7.04j.orig/xfbbd.8
+++ fbb-7.04j/xfbbd.8
@@ -0,0 +1,30 @@
+.TH XFBBD 8
+.SH NAME
+xfbbd \- Daemon for the fbb mailbox
+.SH SYNOPSIS
+.B xfbbd
+.I "[options]"
+
+.SH OPTIONS
+.TP
+.B \-v
+Verbose option. Prints errors, warnings and messages.
+.TP
+.B \-p
+TCP/IP port for the console client. Default is 3286.
+.TP
+.B \-a
+Decode all packets when receiving data on a socket. Normally only
+AX.25 data (NET/ROM and Rose) will be monitored.
+.TP
+.B \-i
+Init mode. Only initialize, don't run. Use this to parse your
+configuration files without actually starting the daemon.
+.TP
+.B \-n
+Don't start communication socket for the console.
+
+
+
+.SH AUTHOR
+This manual page was written by Joop Stakenborg .
--- fbb-7.04j.orig/patches/fbb703.linux2.6.diff
+++ fbb-7.04j/patches/fbb703.linux2.6.diff
@@ -0,0 +1,42 @@
+--- fbbsrc.703c/src/console.c 2000-09-14 22:16:38.000000000 +0200
++++ fbbsrc.703c.rxq/src/console.c 2004-02-13 19:49:34.000000000 +0100
+@@ -893,7 +893,7 @@
+
+ #define MEMINFO_FILE "/proc/meminfo"
+
+-static char buf[300];
++static char buf[1000];
+
+ #define MAX_ROW 3 /* these are a little liberal for flexibility */
+ #define MAX_COL 7
+@@ -929,6 +929,29 @@
+ for (i = 0; i < MAX_ROW; i++) /* zero unassigned fields */
+ for (j = 0; j < MAX_COL; j++)
+ row[i][j] = 0;
++ if (!strncmp("MemTotal:", p, 8)) {
++/* printf("Asuming 2.6 Kernel\n");*/
++ while (*p && !isdigit(*p)) p++;
++ l = sscanf(p, "%u%n", &row[meminfo_main][meminfo_total], &k);
++ p += k;
++ while (*p && !strncmp("MemFree:", p, 8)) p++;
++ while (*p && !isdigit(*p)) p++;
++ l = sscanf(p, "%u%n", &row[meminfo_main][meminfo_free], &k);
++ p += k;
++ while (*p && !strncmp("Buffers:", p, 8)) p++;
++ while (*p && !isdigit(*p)) p++;
++ l = sscanf(p, "%u%n", &row[meminfo_main][meminfo_buffers], &k);
++ p += k;
++ while (*p && !strncmp("Cached:", p, 7)) p++;
++ while (*p && !isdigit(*p)) p++;
++ l = sscanf(p, "%u%n", &row[meminfo_main][meminfo_cached], &k);
++ p += k;
++ while (*p && !strncmp("SwapFree:", p, 9)) p++;
++ while (*p && !isdigit(*p)) p++;
++ l = sscanf(p, "%u%n", &row[meminfo_swap][meminfo_free], &k);
++ p += k;
++ return row;
++ }
+ for (i = 0; i < MAX_ROW && *p; i++)
+ { /* loop over rows */
+ while (*p && !isdigit (*p))
+
--- fbb-7.04j.orig/debian/compat
+++ fbb-7.04j/debian/compat
@@ -0,0 +1 @@
+4
--- fbb-7.04j.orig/debian/changelog
+++ fbb-7.04j/debian/changelog
@@ -0,0 +1,115 @@
+fbb (7.04j-8.2ubuntu1) natty; urgency=low
+
+ * src/Makefile:
+ Move -lncurses to the end of the linker call.
+
+ -- Michael Bienia Fri, 03 Dec 2010 17:12:09 +0100
+
+fbb (7.04j-8.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fixed bashism in /usr/sbin/fbb, closes: #535869
+
+ -- Michael Meskes Sat, 23 Jan 2010 15:19:41 +0100
+
+fbb (7.04j-8.1) unstable; urgency=low
+
+ * Retiring - remove myself from the uploaders list.
+
+ -- Joop Stakenborg Sat, 14 Nov 2009 14:01:07 +0000
+
+fbb (7.04j-8) unstable; urgency=low
+
+ * Fix bashism in /bin/sh script. Thanks Manuel Prinz.
+ Closes: #486030.
+
+ -- Joop Stakenborg Wed, 25 Jun 2008 18:51:19 +0200
+
+fbb (7.04j-7) unstable; urgency=low
+
+ * Make aptitude render the description nicely. Closes: #389050.
+ * Lintian fixes.
+ * Update standards version.
+
+ -- Joop Stakenborg Tue, 13 Nov 2007 18:55:46 +0100
+
+fbb (7.04j-6) unstable; urgency=low
+
+ * Update debian/rules to use debhelper rather than debmake
+
+ -- Hamish Moffatt Tue, 3 Jan 2006 00:39:59 +1100
+
+fbb (7.04j-5) unstable; urgency=low
+
+ * Added a new uploader to the Uploaders field.
+
+ -- Joop Stakenborg Tue, 12 Apr 2005 13:31:59 +0200
+
+fbb (7.04j-4) unstable; urgency=low
+
+ * Upload for the 'Debian Hamradio Maintainers'.
+ * Watch file added.
+
+ -- Joop Stakenborg Sat, 9 Apr 2005 18:10:17 +0200
+
+fbb (7.04j-3) unstable; urgency=low
+
+ * Patch by Andreas Jochens to fix a FTBFS on amd64. Thanks! Closes: #297570.
+
+ -- Joop Stakenborg Wed, 2 Mar 2005 13:35:35 +0100
+
+fbb (7.04j-2) unstable; urgency=low
+
+ * A patch by Jeroen Vreeken to let fbb run under 2.6
+ kernels.
+
+ -- Joop Stakenborg Thu, 19 Feb 2004 22:45:53 +0100
+
+fbb (7.04j-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fixes compilation issues. Closes: #226532.
+
+ -- Joop Stakenborg Fri, 9 Jan 2004 00:40:37 +0100
+
+fbb (7.04-3) unstable; urgency=low
+
+ * Update standards version.
+ * Lintian fixes.
+ * Manual page for fbbgetconf.
+
+ -- Joop Stakenborg Fri, 21 Feb 2003 16:55:10 +0100
+
+fbb (7.04-2) unstable; urgency=low
+
+ * Suggest fbbdoc.
+
+ -- Joop Stakenborg Tue, 25 Dec 2001 00:16:55 +0100
+
+fbb (7.04-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Joop Stakenborg Wed, 21 Nov 2001 19:07:58 +0100
+
+fbb (7.03-3) unstable; urgency=low
+
+ * Fix for gcc-3.0, so hppa can build. Closes: #104872.
+
+ -- Joop Stakenborg Sat, 14 Jul 2001 10:16:48 +0200
+
+fbb (7.03-2) unstable; urgency=low
+
+ * Remove libc6-dev from the build-depends line as per debian policy.
+
+ -- Joop Stakenborg Tue, 10 Jul 2001 21:59:39 +0200
+
+fbb (7.03-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Joop Stakenborg Wed, 25 Apr 2001 11:48:25 +0200
+
+Local variables:
+mode: debian-changelog
+End:
--- fbb-7.04j.orig/debian/watch
+++ fbb-7.04j/debian/watch
@@ -0,0 +1,3 @@
+# Site Directory Pattern Version Script
+version=2
+http://ftp.funet.fi/pub/ham/packet/bbs/f6fbb/distrib/linux/src/xd(.*)\-src\.tgz debian uupdate
--- fbb-7.04j.orig/debian/fbb.dirs
+++ fbb-7.04j/debian/fbb.dirs
@@ -0,0 +1 @@
+usr/sbin
--- fbb-7.04j.orig/debian/copyright
+++ fbb-7.04j/debian/copyright
@@ -0,0 +1,16 @@
+This package was debianized by Joop Stakenborg pa3aba@debian.org on
+Wed, 25 Apr 2001 11:48:25 +0200.
+
+It was downloaded from ftp.f6fbb.org
+
+Copyright taken from one of the src files:
+
+Copyright (C) 1986-2000 by
+
+ F6FBB - Jean-Paul ROUBELAT
+ 6, rue George Sand
+ 31120 - Roquettes - France
+ jpr@f6fbb.org
+
+fbb is licensed under the GPL. A copy should be on your debian
+system under /usr/share/common-licenses/GPL.
--- fbb-7.04j.orig/debian/fbb.examples
+++ fbb-7.04j/debian/fbb.examples
@@ -0,0 +1,3 @@
+conf/fbb.conf.sample
+conf/fbb.conf.min.sample
+
--- fbb-7.04j.orig/debian/rules
+++ fbb-7.04j/debian/rules
@@ -0,0 +1,52 @@
+#!/usr/bin/make -f
+# Made with the aid of debmake, by Christoph Lameter,
+# based on the sample debian/rules file for GNU hello by Ian Jackson.
+
+package=fbb
+
+build:
+ dh_testdir
+ $(MAKE)
+ touch build
+
+clean:
+ dh_testdir
+ dh_clean
+ -rm -f build
+ [ ! -f Makefile ] || $(MAKE) clean
+ -rm -f `find . -name "*~"`
+ -rm -f src/fbbgetconf
+
+binary-indep: build
+ dh_testdir
+ dh_testroot
+
+# There are no architecture-independent files to be uploaded
+# generated by this package. If there were any they would be
+# made here.
+
+binary-arch: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+
+ dh_installdirs
+ $(MAKE) install DESTDIR=`pwd`/debian/fbb
+
+ dh_installchangelogs CHANGES
+ dh_installdocs README FBBTREE
+ dh_installexamples
+ dh_installman fbb.8 fbbgetconf.1 xfbbC.8 xfbbd.8
+
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+
+.PHONY: binary binary-arch binary-indep clean checkroot
--- fbb-7.04j.orig/debian/control
+++ fbb-7.04j/debian/control
@@ -0,0 +1,24 @@
+Source: fbb
+Build-Depends: debhelper (>= 4), libncurses5-dev, libax25-dev
+Section: hamradio
+Priority: optional
+Maintainer: Ubuntu Developers
+XSBC-Original-Maintainer: Debian Hamradio Maintainers
+Uploaders: Jaime Robles , Patrick Ouellette , Hamish Moffatt
+Standards-Version: 3.7.2
+
+Package: fbb
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: fbbdoc
+Description: Packet radio mailbox and utilities
+ The fbb package contains software written by f6fbb for setting up a packet
+ radio mailbox. It is intended for amateur radio operators. A short overview
+ of some of the binaries:
+ .
+ * fbb: Script to start the daemon.
+ * xfbbd: The daemon which listens for incoming connects.
+ * epurmess: Delete messages based on age.
+ * epurwp: White Pages maintenance.
+ * reqdir: FBB server which requests directory listings.
+ * xfbbC: B/W Ncurses console for xfbbd.
--- fbb-7.04j.orig/debian/README.debian
+++ fbb-7.04j/debian/README.debian
@@ -0,0 +1,11 @@
+fbb for Debian
+--------------
+
+Some issues with the fbb package:
+
+I have not included kernel 2.0 support, so you should preferably run a 2.2
+or 2.4 kernel with fbb.
+
+xfbbX cannot be build because it is motif 2.0 based.
+
+Joop Stakenborg , Wed, 25 Apr 2001 11:48:25 +0200
--- fbb-7.04j.orig/include/serv.h
+++ fbb-7.04j/include/serv.h
@@ -100,7 +100,6 @@
extern "C" {
#endif
-char *strupr (char *);
char *itoa(int, char*, int);
char *ltoa(long, char*, int);
char *ultoa(unsigned long, char*, int);
--- fbb-7.04j.orig/src/epurmess.c
+++ fbb-7.04j/src/epurmess.c
@@ -894,13 +894,17 @@
#ifdef ENGLISH
printf ("Read %6ld %c%c %5ld %-6s%7s %-6s %-6s %s %1.19s\r",
+ ligne->numero, ligne->type, ligne->status,
+ ligne->taille, ligne->desti, bbs_v, ligne->exped,
+ date, datech, titre);
+}
#else
printf ("Lect %6ld %c%c %5ld %-6s%7s %-6s %-6s %s %1.19s\r",
-#endif
ligne->numero, ligne->type, ligne->status,
ligne->taille, ligne->desti, bbs_v, ligne->exped,
date, datech, titre);
}
+#endif
int find (char *s)
--- fbb-7.04j.orig/src/trajec.c
+++ fbb-7.04j/src/trajec.c
@@ -110,7 +110,6 @@
static double julien (double, int, int, int, int, int);
-static int round (double);
static long julien_to_pc (double);
@@ -128,14 +127,6 @@
static void satsta (void);
-static int round (double val)
-{
- if (val > 0.0)
- return ((int) (val + 0.5));
- else
- return ((int) (val - 0.5));
-}
-
static double julien (double d3, int n3, int y3, int h3, int m3, int s3)
{
double j8;
--- fbb-7.04j.orig/src/fbbgetconf.c
+++ fbb-7.04j/src/fbbgetconf.c
@@ -83,7 +83,7 @@
fprintf(stderr, "\nfbbgetconf V %d.%02d\n", MAJEUR, MINEUR);
#endif
fprintf(stderr,
- "format : fbbgetconf [-a] [-d] [-h] [-l] [-f configfile] [key] [key] ...\n");
+ "format : fbbgetconf [-a] [-d] [-h] [-f configfile] [key] [key] ...\n");
exit(0);
}
--- fbb-7.04j.orig/src/clr_user.c
+++ fbb-7.04j/src/clr_user.c
@@ -27,6 +27,7 @@
#define ENGLISH
#include
+#include
#include
#include
#include "version.h"
--- fbb-7.04j.orig/src/Makefile
+++ fbb-7.04j/src/Makefile
@@ -1,5 +1,5 @@
# this is only if "old" ax25 for kernel 2.0.x are used
-AX25OLDPATH = /usr/src/ax25
+#AX25OLDPATH = /usr/src/ax25
# the rest should not be changed
AX25LIBPATH = /usr/lib
@@ -147,7 +147,7 @@
ifeq ($(USE_NCURSES),1)
CFLAGS += -DUSE_NCURSES
xfbbC : xfbbC.o md5c.o terminal.o
- $(CC) $(CFLAGS) -o xfbbC -lncurses xfbbC.o md5c.o terminal.o
+ $(CC) $(CFLAGS) -o xfbbC xfbbC.o md5c.o terminal.o -lncurses
else
xfbbC : xfbbC.o md5c.o
@echo "***"
--- fbb-7.04j.orig/src/initfwd.c
+++ fbb-7.04j/src/initfwd.c
@@ -31,7 +31,7 @@
#include
#define NBCAS 3
-
+#define niveau niveau_initfwd
static int niveau;
static int etat_bloc;
static int nbif[NBCAS];
--- fbb-7.04j.orig/src/console.c
+++ fbb-7.04j/src/console.c
@@ -911,7 +911,7 @@
#define MEMINFO_FILE "/proc/meminfo"
-static char buf[300];
+static char buf[1000];
#define MAX_ROW 3 /* these are a little liberal for flexibility */
#define MAX_COL 7
@@ -947,6 +947,29 @@
for (i = 0; i < MAX_ROW; i++) /* zero unassigned fields */
for (j = 0; j < MAX_COL; j++)
row[i][j] = 0;
+ if (!strncmp("MemTotal:", p, 8)) {
+/* printf("Asuming 2.6 Kernel\n");*/
+ while (*p && !isdigit(*p)) p++;
+ l = sscanf(p, "%u%n", &row[meminfo_main][meminfo_total], &k);
+ p += k;
+ while (*p && !strncmp("MemFree:", p, 8)) p++;
+ while (*p && !isdigit(*p)) p++;
+ l = sscanf(p, "%u%n", &row[meminfo_main][meminfo_free], &k);
+ p += k;
+ while (*p && !strncmp("Buffers:", p, 8)) p++;
+ while (*p && !isdigit(*p)) p++;
+ l = sscanf(p, "%u%n", &row[meminfo_main][meminfo_buffers], &k);
+ p += k;
+ while (*p && !strncmp("Cached:", p, 7)) p++;
+ while (*p && !isdigit(*p)) p++;
+ l = sscanf(p, "%u%n", &row[meminfo_main][meminfo_cached], &k);
+ p += k;
+ while (*p && !strncmp("SwapFree:", p, 9)) p++;
+ while (*p && !isdigit(*p)) p++;
+ l = sscanf(p, "%u%n", &row[meminfo_swap][meminfo_free], &k);
+ p += k;
+ return row;
+ }
for (i = 0; i < MAX_ROW && *p; i++)
{ /* loop over rows */
while (*p && !isdigit (*p))