commit xibod

Hello community, here is the log from the commit of package xibod checked in at Sun Aug 6 22:20:18 CEST 2006. -------- --- xibod/xibod.changes 2006-01-25 21:43:09.000000000 +0100 +++ xibod/xibod.changes 2006-08-03 15:49:04.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 3 15:47:57 CEST 2006 - kkeil@suse.de + +- cleanup some warnings, add correct use of RPM_OPT_FLAGS +- correct directories for xorg 7.1 + +------------------------------------------------------------------- New: ---- xibod.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xibod.spec ++++++ --- /var/tmp/diff_new_pack.W8rjpi/_old 2006-08-06 22:20:14.000000000 +0200 +++ /var/tmp/diff_new_pack.W8rjpi/_new 2006-08-06 22:20:14.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -17,11 +17,12 @@ Autoreqprov: on URL: http://www.datenwelt.net/oss/ibod Version: 2.0 -Release: 818 +Release: 830 Summary: A Control Panel for the Ibod ISDN Bandwidth-On-Demand Daemon Source: xibod-2.0.tar.bz2 Source1: xibod.desktop -Patch: ibod.dif +Patch0: xibod.dif +Patch1: ibod.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -38,31 +39,33 @@ %prep %setup -n xibod +%patch -p1 cd ../ibod -%patch +%patch1 %build test -x /usr/sbin/switch_motif_linking && \ /usr/sbin/switch_motif_linking dynamic -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LDFLAGS="-L/usr/X11R6/%{_lib}" +make CFLAGS="$RPM_OPT_FLAGS" +#LDFLAGS="-L/usr/%{_lib}" #mv xibod xibod.SuSE-dynamic #test -x /usr/sbin/switch_motif_linking && \ # /usr/sbin/switch_motif_linking static #make LDFLAGS="-L/usr/X11R6/lib" cd ../ibod rm -f ibod -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" +make CFLAGS="$RPM_OPT_FLAGS" %install -mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin -mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults +mkdir -p $RPM_BUILD_ROOT/usr/bin +mkdir -p $RPM_BUILD_ROOT/usr/share/X11/app-defaults mkdir -p $RPM_BUILD_ROOT/usr/sbin mkdir -p $RPM_BUILD_ROOT/etc/ppp mkdir -p $RPM_BUILD_ROOT/usr/share/man/{man1,man4} -install -p xibod $RPM_BUILD_ROOT/usr/X11R6/bin -#install -p xibod.SuSE-dynamic $RPM_BUILD_ROOT/usr/X11R6/bin -install -p Xibod.ad $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults/Xibod -#ln -sf xibod.SuSE-static $RPM_BUILD_ROOT/usr/X11R6/bin/xibod +install -p xibod $RPM_BUILD_ROOT/usr/bin +#install -p xibod.SuSE-dynamic $RPM_BUILD_ROOT/usr/bin +install -p Xibod.ad $RPM_BUILD_ROOT/usr/share/X11/app-defaults/Xibod +#ln -sf xibod.SuSE-static $RPM_BUILD_ROOT/usr/bin/xibod install -p -d $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} install -p README $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} cd ../ibod @@ -74,8 +77,8 @@ %files %defattr(-,root,root) -/usr/X11R6/bin/xibod -%config /usr/X11R6/lib/X11/app-defaults/Xibod +/usr/bin/xibod +%config /usr/share/X11/app-defaults/Xibod /usr/sbin/ibod /usr/share/applications/*.desktop %config(noreplace) /etc/ppp/ibod.cf @@ -84,6 +87,9 @@ %doc %{_defaultdocdir}/%{name} %changelog -n xibod +* Thu Aug 03 2006 - kkeil@suse.de +- cleanup some warnings, add correct use of RPM_OPT_FLAGS +- correct directories for xorg 7.1 * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Fri Jan 20 2006 - schwab@suse.de ++++++ ibod.dif ++++++ --- /var/tmp/diff_new_pack.W8rjpi/_old 2006-08-06 22:20:14.000000000 +0200 +++ /var/tmp/diff_new_pack.W8rjpi/_new 2006-08-06 22:20:14.000000000 +0200 @@ -1,5 +1,7 @@ ---- ibod.1 -+++ ibod.1 2002/09/12 11:42:45 +Index: ibod.1 +=================================================================== +--- ibod.1.orig ++++ ibod.1 @@ -2,7 +2,7 @@ .SH NAME ibod \- ISDN MPPP bandwidth on demand daemon @@ -9,7 +11,7 @@ .SH DESCRIPTION .B Ibod -@@ -33,7 +33,10 @@ +@@ -33,7 +33,10 @@ interface. .B Ibod is also listening on TCP port 6051 for eventual connection from control panels @@ -21,9 +23,28 @@ .SH SIGNALS Upon receiving SIGHUP, the configuration file is re-read. ---- ibod.c -+++ ibod.c 2002/09/13 11:39:32 -@@ -44,7 +44,7 @@ +Index: ibod.c +=================================================================== +--- ibod.c.orig ++++ ibod.c +@@ -1,8 +1,3 @@ +-static char *rcsId = "$Id: ibod.c,v 2.1 2001/03/09 10:15:09 kkeil Exp $"; +-static char *rcsSymbol = "$Symbol$"; +- +-#include +-#include + #include + #include + #include +@@ -11,6 +6,7 @@ static char *rcsSymbol = "$Symbol$"; + #include + #include + #include ++#include + #include + #include + #include +@@ -44,7 +40,7 @@ static int bring_down_allslave(Bundle_t static int debug=0; static char conffile[256]; @@ -32,7 +53,16 @@ static int usageflags[ISDN_MAX_CHANNELS]; static char phone[ISDN_MAX_CHANNELS][32]; static Siobytes iobytes[ISDN_MAX_CHANNELS]; -@@ -261,6 +261,7 @@ +@@ -251,7 +247,7 @@ list_config(void) + + int main(int argc, char *argv[]) + { +- fd_set readfds, writefds, execptfds; ++ fd_set readfds, execptfds; + int i; + int s; /* Listening socket descriptor */ + struct sockaddr_in server; /* Socket protocol descriptor */ +@@ -261,6 +257,7 @@ int main(int argc, char *argv[]) Bundle_t *act; int rval; int tmpsock = -1; @@ -40,7 +70,7 @@ openlog("ibod", LOG_PID, LOG_DAEMON); -@@ -268,15 +269,27 @@ +@@ -268,15 +265,27 @@ int main(int argc, char *argv[]) if ((home = getenv("IBOD_HOME")) == NULL) home = IBOD_DEFAULT_DIR; @@ -71,7 +101,31 @@ } syslog(LOG_NOTICE, "ibod start: Configuration=%s\n", conffile); -@@ -333,8 +346,13 @@ +@@ -296,7 +305,7 @@ int main(int argc, char *argv[]) + switch((rval=daemon(0,0))) + { + case -1: +- syslog(LOG_ERR, "daemon() call failed: %s\n", sys_errlist[errno]); ++ syslog(LOG_ERR, "daemon() call failed: %s\n", strerror(errno)); + bye(1); + case 0: + setpgrp(); +@@ -310,7 +319,7 @@ int main(int argc, char *argv[]) + if (pidfile) { + FILE *fd = fopen(pidfile, "w"); + if (fd == 0) { +- syslog(LOG_ERR, "open %s: %s\n", pidfile, sys_errlist[errno]); ++ syslog(LOG_ERR, "open %s: %s\n", pidfile, strerror(errno)); + bye(1); + } + +@@ -328,15 +337,20 @@ int main(int argc, char *argv[]) + + /* Create a socket for control panel communication */ + if ((s = socket(PF_INET, SOCK_STREAM, 0)) == -1) { +- syslog(LOG_ERR, "creating socket: %s\n", sys_errlist[errno]); ++ syslog(LOG_ERR, "creating socket: %s\n", strerror(errno)); + bye(1); } server.sin_family = AF_INET; @@ -80,13 +134,80 @@ + server.sin_addr.s_addr = INADDR_ANY; + if(inet_pton(AF_INET, listen_to, &server.sin_addr) <= 0) { + syslog(LOG_ERR, "unable to convert listen address '%s': %s\n", -+ listen_to, sys_errlist[errno]); ++ listen_to, strerror(errno)); + bye(1); + } if (bind(s, (struct sockaddr *)&server, sizeof(struct sockaddr_in)) < 0) { - syslog(LOG_ERR, "binding stream socket: %s\n", sys_errlist[errno]); +- syslog(LOG_ERR, "binding stream socket: %s\n", sys_errlist[errno]); ++ syslog(LOG_ERR, "binding stream socket: %s\n", strerror(errno)); bye(1); -@@ -560,7 +578,7 @@ + } + +@@ -375,16 +389,16 @@ int main(int argc, char *argv[]) + } + + if ((rc = select(max_fd + 1, &readfds, NULL, &execptfds, &timeout)) < 0) { +- syslog(LOG_ERR, "select: %s\n", sys_errlist[errno]); ++ syslog(LOG_ERR, "select: %s\n", strerror(errno)); + continue; + } + if ((debug & DEBUG_SEL) & rc) + syslog(LOG_DEBUG, "select: %d\n", rc); + + if (FD_ISSET(s, &readfds)) { +- tmpsock = accept(s, (struct sockaddr *)0, (int *)0); ++ tmpsock = accept(s, (struct sockaddr *)0, (unsigned int *)0); + if (tmpsock == -1) +- syslog(LOG_ERR, "accept: %s\n", sys_errlist[errno]); ++ syslog(LOG_ERR, "accept: %s\n", strerror(errno)); + } + + if (FD_ISSET(s, &execptfds)) { +@@ -395,12 +409,11 @@ int main(int argc, char *argv[]) + memset(buf, 0, sizeof(buf)); + if ((rval = read(tmpsock, buf, 1024)) < 0) { + syslog(LOG_ERR, "reading stream(%d) message: %s\n", +- tmpsock, sys_errlist[errno]); ++ tmpsock, strerror(errno)); + close(tmpsock); + tmpsock = -1; + } else { + OpenCMD_t *oc = (OpenCMD_t*)buf; +- int i; + + if (debug & DEBUG_CMD) + syslog(LOG_DEBUG, "get tmpsock(%d) command(%d) rval(%d)\n", +@@ -441,7 +454,7 @@ int main(int argc, char *argv[]) + memset(buf, 0, sizeof(buf)); + if ((rval = read(act->msgsock, buf, 1024)) < 0) { + syslog(LOG_ERR, "reading stream(%d) message: %s\n", +- act->msgsock, sys_errlist[errno]); ++ act->msgsock, strerror(errno)); + errsocket = act->msgsock; + } else { + int cmd = *(int *)buf; +@@ -500,7 +513,10 @@ int main(int argc, char *argv[]) + memcpy(&buf[INBOUND_RATE_POS], &act->in_bytes_per_sec, POBJ_SIZE); + memcpy(&buf[OUTBOUND_RATE_POS], &act->out_bytes_per_sec, POBJ_SIZE); + +- write(act->msgsock, buf, STATUS_FRAME_SIZE); ++ if ((rval = write(act->msgsock, buf, STATUS_FRAME_SIZE)) < 0) { ++ syslog(LOG_ERR, "writing msgsock(%d) message: %s\n", ++ act->msgsock, strerror(errno)); ++ } + } + act = act->next; + } +@@ -531,7 +547,7 @@ static void pipehndl(int sig) + Bundle_t *b = bundle_list; + + syslog(LOG_ERR, "errsocket(%d) caught SIGPIPE: %s\n", errsocket, +- sys_errlist[errno]); ++ strerror(errno)); + + while(b) { + if ((b->msgsock != -1) && (b->msgsock == errsocket)) { +@@ -560,7 +576,7 @@ static int phone_index(char *number, int static void get_if_state() { @@ -95,9 +216,135 @@ struct timeval tv_now; unsigned long in_bytes_now, out_bytes_now; int ms_delta; ---- ibod.h -+++ ibod.h 2002/09/13 09:02:01 -@@ -18,6 +18,7 @@ +@@ -572,7 +588,7 @@ get_if_state() + + /* Open the info device */ + if ((fd = open(ISDN_INFO_DEV, O_RDONLY | O_NDELAY)) < 0) { +- syslog(LOG_ERR, "%s: %s\n", ISDN_INFO_DEV, sys_errlist[errno]); ++ syslog(LOG_ERR, "%s: %s\n", ISDN_INFO_DEV, strerror(errno)); + bye(1); + } + +@@ -653,14 +669,14 @@ get_if_state() + + /* Get byte in/out for all channels */ + if (ioctl(fd, IIOCGETCPS, &iobytes)) { +- syslog(LOG_ERR, "%s: %s\n", IIOCGETCPS, sys_errlist[errno]); ++ syslog(LOG_ERR, "ioctl IOCGETCPS(%x): %s\n", IIOCGETCPS, strerror(errno)); + bye(1); + } + + if (debug & DEBUG_ISDN) { + p = buf; + for (i=0; ichannels_now++; + } + if (debug & DEBUG_ISDN) +- syslog(LOG_DEBUG, "bundle %s:%d channels up i/o: %u,%u\n", ++ syslog(LOG_DEBUG, "bundle %s:%d channels up i/o: %lu,%lu\n", + act->cfg.dev, act->channels_now, in_bytes_now, out_bytes_now); + if ((act->channels_last == -1) || + (act->channels_now < act->channels_last)) { +@@ -751,7 +767,7 @@ get_if_state() + act->out_bytes_last = out_bytes_now; + + if (debug & DEBUG_RATE) +- syslog(LOG_DEBUG, "%s rates: %d/%d\n", act->cfg.dev, ++ syslog(LOG_DEBUG, "%s rates: %ld/%ld\n", act->cfg.dev, + act->in_bytes_per_sec, act->out_bytes_per_sec); + /* Take up or down slave channel */ + +@@ -767,7 +783,7 @@ get_if_state() + /* Start stay up timer */ + gettimeofday(&act->tv_up, NULL); + if (debug & DEBUG_UPDOWN) +- syslog(LOG_DEBUG, "%s: up channel %d/%d time=%d sec\n", ++ syslog(LOG_DEBUG, "%s: up channel %d/%d time=%ld sec\n", + act->cfg.dev, act->channels_now, act->cfg.maxchan, + act->tv_up.tv_sec); + +@@ -784,7 +800,7 @@ get_if_state() + /* Check that the min stay up timer has expired */ + gettimeofday(&tv_now, NULL); + if (debug & DEBUG_UPDOWN) +- syslog(LOG_DEBUG, "%s: down channel %d/%d time=%d sec diff %d sec\n", ++ syslog(LOG_DEBUG, "%s: down channel %d/%d time=%ld sec diff %ld sec\n", + act->cfg.dev, act->channels_now, act->cfg.maxchan, + tv_now.tv_sec, tv_now.tv_sec - act->tv_up.tv_sec); + if (tv_now.tv_sec - act->tv_up.tv_sec > act->cfg.stayup_time) { +@@ -811,12 +827,12 @@ static int bring_up_slave(Bundle_t *b) + { int fd, rc; + + if ((fd = open(ISDN_CTLR_DEV, O_RDWR)) < 0) { +- syslog(LOG_ERR, "%s: %s\n", ISDN_CTLR_DEV, sys_errlist[errno]); ++ syslog(LOG_ERR, "%s: %s\n", ISDN_CTLR_DEV, strerror(errno)); + return -1; + } + + if ((rc = ioctl(fd, IIOCNETALN, b->cfg.dev)) < 0) { +- syslog(LOG_ERR, "%s: %s\n", b->cfg.dev, sys_errlist[errno]); ++ syslog(LOG_ERR, "%s: %s\n", b->cfg.dev, strerror(errno)); + return -1; + } + +@@ -825,7 +841,7 @@ static int bring_up_slave(Bundle_t *b) + if (rc) + syslog(LOG_NOTICE, "unable to attach additional link: %d\n", rc); + else { +- syslog(LOG_NOTICE, "added new link for %s (in cps=%d, out cps=%d)\n", ++ syslog(LOG_NOTICE, "added new link for %s (in cps=%ld, out cps=%ld)\n", + b->cfg.dev, b->in_bytes_per_sec, b->out_bytes_per_sec); + } + +@@ -838,12 +854,12 @@ static int bring_down_slave(Bundle_t *b) + int fd, rc; + + if ((fd = open(ISDN_CTLR_DEV, O_RDWR)) < 0) { +- syslog(LOG_ERR, "%s: %s\n", ISDN_CTLR_DEV, sys_errlist[errno]); ++ syslog(LOG_ERR, "%s: %s\n", ISDN_CTLR_DEV, strerror(errno)); + return -1; + } + + if ((rc = ioctl(fd, IIOCNETDLN, b->cfg.dev)) < 0) { +- syslog(LOG_ERR, "%s: %s\n", b->cfg.dev, sys_errlist[errno]); ++ syslog(LOG_ERR, "%s: %s\n", b->cfg.dev, strerror(errno)); + return -1; + } + +@@ -852,7 +868,7 @@ static int bring_down_slave(Bundle_t *b) + if (rc) + syslog(LOG_ERR, "unable to remove additional link: %d\n", rc); + else { +- syslog(LOG_NOTICE, "removed link(%d) for %s(in cps=%d, out cps=%d)\n", ++ syslog(LOG_NOTICE, "removed link(%d) for %s(in cps=%ld, out cps=%ld)\n", + b->channels_last, b->cfg.dev, b->in_bytes_per_sec, + b->out_bytes_per_sec); + } +Index: ibod.h +=================================================================== +--- ibod.h.orig ++++ ibod.h +@@ -3,6 +3,13 @@ + */ + + #include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + + #define INTERVAL 500 + #define DEVICE "ippp0" +@@ -18,6 +25,7 @@ #define ISDN_INFO_DEV "/dev/isdninfo" #define ISDN_CTLR_DEV "/dev/isdnctrl" #define IBOD_PORT 6051 @@ -105,7 +352,7 @@ /* Protocol specification */ #define MAX_MSG_LEN 1024 -@@ -35,6 +36,9 @@ +@@ -35,6 +43,9 @@ #define CMD_UP2 4 #define CMD_DOWN2 5 ++++++ xibod.dif ++++++ Index: xibod/stubs.c =================================================================== --- xibod.orig/stubs.c +++ xibod/stubs.c @@ -59,15 +59,15 @@ static void update_indicators(int n); void quit (Widget w, XtPointer client_data, XmPushButtonCallbackStruct *call_data) { - int cmd; + int cmd, ret = 0; if (sd > -1) { cmd = CMD_CLOSE; - write(sd, &cmd, sizeof(int)); + ret = write(sd, &cmd, sizeof(int)); close(sd); sd = -1; } - exit(0); + exit(ret); } /* @@ -135,7 +135,10 @@ void open_connection (Widget w, XtPointe XmStringFree(ls); - write(sd, &cmd, sizeof(OpenCMD_t)); + if (write(sd, &cmd, sizeof(OpenCMD_t)) <0) { + perror("xibod: open"); + exit(1); + } XtUnmanageChild(open_dialog_w->dialog_container_w); XtSetSensitive(toplevel_w->open_button_w, TRUE); @@ -172,7 +175,7 @@ static void read_rate(Widget w, XtPointe void close_connection (Widget w, XtPointer client_data, XtPointer xt_call_data ) { - int cmd; + int cmd, ret; XmString ls; XmPushButtonCallbackStruct *call_data = (XmPushButtonCallbackStruct *) xt_call_data; @@ -180,7 +183,7 @@ close_connection (Widget w, XtPointer cl XtRemoveInput(input_id); if (sd > -1) { cmd = CMD_CLOSE; - write(sd, &cmd, sizeof(int)); + ret = write(sd, &cmd, sizeof(int)); close(sd); sd = -1; } @@ -258,9 +261,9 @@ up2 (Widget w, XtPointer client_data, Xt { XmPushButtonCallbackStruct *call_data = (XmPushButtonCallbackStruct *) xt_call_data; - int cmd = CMD_UP2; + int cmd = CMD_UP2, ret; - write(sd, &cmd, sizeof(int)); + ret = write(sd, &cmd, sizeof(int)); } /* @@ -272,9 +275,9 @@ down2 (Widget w, XtPointer client_data, { XmPushButtonCallbackStruct *call_data = (XmPushButtonCallbackStruct *) xt_call_data; - int cmd = CMD_DOWN2; + int cmd = CMD_DOWN2, ret; - write(sd, &cmd, sizeof(int)); + ret = write(sd, &cmd, sizeof(int)); } /* @@ -285,13 +288,13 @@ void enable (Widget w, XtPointer client_data, XtPointer xt_call_data ) { XmToggleButtonCallbackStruct *call_data = (XmToggleButtonCallbackStruct *) xt_call_data; - int cmd; + int cmd, ret; if (call_data->set == True) cmd = CMD_ENABLE; else cmd = CMD_DISABLE; - write(sd, &cmd, sizeof(int)); + ret = write(sd, &cmd, sizeof(int)); } Index: xibod/xibod.c =================================================================== --- xibod.orig/xibod.c +++ xibod/xibod.c @@ -27,7 +27,7 @@ #include #include #include - +#include typedef struct reopen_warning_w_s { Widget reopen_warning_w; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...