Update to qadsl 1.3.3. Utility to login on the Telia AB ADSL service.
State Changed From-To: open->feedback To maintainer: do you approve of this patch?
Could you submit the update in unified diff format, please? Volker
Sorry about that. I reworked the port so much I forgot it was an update :) Apply with usual patch -p0 < qadsl.diff --- start qadsl.diff --- diff -crN qadsl.orig/Makefile qadsl/Makefile *** qadsl.orig/Makefile Mon Nov 3 02:18:42 2003 --- qadsl/Makefile Wed Dec 22 13:54:45 2004 *************** *** 6,23 **** # PORTNAME= qadsl ! PORTVERSION= 1.2 CATEGORIES= net ! MASTER_SITES= http://kuba.unix.se/code/qadsl/ ! DISTNAME= qadsl-final-${PORTVERSION} MAINTAINER= arlu@telia.com ! COMMENT= Auto login/Keep-alive for Telia AB ADSL and COMHEM Cable internet MAN8= qadsl.8 ! MANCOMPRESSED= yes post-install: @${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE} .include <bsd.port.mk> --- 6,37 ---- # PORTNAME= qadsl ! PORTVERSION= 1.3.3 CATEGORIES= net ! MASTER_SITES= http://savannah.gnu.org/download/alive/ ! DISTNAME= qadsl-${PORTVERSION} MAINTAINER= arlu@telia.com ! COMMENT= Auto login/Keep-alive for Telia AB ADSL, COMHEM Cable and Tiscali Internet. ! ! USE_RC_SUBR= yes ! RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} ! ! GNU_CONFIGURE= yes ! CONFIGURE_ARGS+= \ ! --with-global-cfg=${PREFIX}/etc/qadsl.conf \ ! --with-pidfile=/var/run/qadsl.pid MAN8= qadsl.8 ! MAN5= qadsl.conf.5 ! ! post-extract: ! @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ! ${FILESDIR}/qadsl.sh > ${WRKSRC}/qadsl.sh ! @${CAT} ${WRKSRC}/etc/qadsl.conf > ${WRKSRC}/etc/qadsl.conf.sample post-install: + ${INSTALL_SCRIPT} ${WRKSRC}/qadsl.sh ${PREFIX}/etc/rc.d/qadsl.sh @${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE} .include <bsd.port.mk> diff -crN qadsl.orig/distinfo qadsl/distinfo *** qadsl.orig/distinfo Wed Mar 31 05:10:13 2004 --- qadsl/distinfo Wed Dec 22 13:54:45 2004 *************** *** 1,2 **** ! MD5 (qadsl-final-1.2.tar.gz) = 42e25b2a6016ff6d5ffa4f9707ac4614 ! SIZE (qadsl-final-1.2.tar.gz) = 12208 --- 1,2 ---- ! MD5 (qadsl-1.3.3.tar.gz) = 68657b0c0c35ee700bdf353508a5cb1d ! SIZE (qadsl-1.3.3.tar.gz) = 275860 diff -crN qadsl.orig/files/patch-Makefile qadsl/files/patch-Makefile *** qadsl.orig/files/patch-Makefile Thu Jun 27 13:44:20 2002 --- qadsl/files/patch-Makefile Thu Jan 1 01:00:00 1970 *************** *** 1,51 **** - *** Makefile.orig Thu Dec 13 21:31:26 2001 - --- Makefile Thu Dec 13 22:20:45 2001 - *************** - *** 5,28 **** - MACRO=__OpenBSD__ - OBJS=main.o netfunc.o conf.o func.o - SRC=main.c netfunc.c conf.c func.c - ! CPATH=/etc/ - ! INSTALL=/usr/local/sbin/ - ! MANPATH=/usr/local/man/man8/ - - all:${PROG} - - ${PROG}: - ! ${CC} -c ${SRC} - ! ${CC} -o ${PROG} ${OBJS} - ! - ! bsd: - ! ${CC} -D${MACRO} -c ${SRC} - ${CC} -o ${PROG} ${OBJS} - - clean: - rm -fr ${PROG} ${OBJS} - - install: - ! cp ${PROG} ${INSTALL} - ! cp ${CONF} ${CPATH} - cp qadsl.8.gz ${MANPATH} - --- 5,26 ---- - MACRO=__OpenBSD__ - OBJS=main.o netfunc.o conf.o func.o - SRC=main.c netfunc.c conf.c func.c - ! CPATH=${PREFIX}/etc/ - ! INSTALL=${PREFIX}/sbin/ - ! RC=${PREFIX}/etc/rc.d/ - ! MANPATH=${PREFIX}/man/man8/ - - all:${PROG} - - ${PROG}: - ! ${CC} -D${MACRO} -DCONF=\"${CPATH}/${CONF}\" -c ${SRC} - ${CC} -o ${PROG} ${OBJS} - - clean: - rm -fr ${PROG} ${OBJS} - - install: - ! install ${PROG} ${INSTALL} - ! cp ${CONF} ${CPATH}/${CONF}.sample - cp qadsl.8.gz ${MANPATH} - + cp qadsl.sh ${RC} --- 0 ---- diff -crN qadsl.orig/files/patch-etc::Makefile.in qadsl/files/patch-etc::Makefile.in *** qadsl.orig/files/patch-etc::Makefile.in Thu Jan 1 01:00:00 1970 --- qadsl/files/patch-etc::Makefile.in Wed Dec 22 13:54:45 2004 *************** *** 0 **** --- 1,21 ---- + *** etc.orig/Makefile.in Sat Sep 11 19:01:40 2004 + --- etc/Makefile.in Sat Sep 11 19:01:59 2004 + *************** + *** 134,141 **** + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + ! sysconf_DATA = qadsl.conf + ! EXTRA_DIST = qadsl.conf + all: all-am + + .SUFFIXES: + --- 134,141 ---- + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + ! sysconf_DATA = qadsl.conf.sample + ! EXTRA_DIST = qadsl.conf.sample + all: all-am + + .SUFFIXES: diff -crN qadsl.orig/files/patch-func.c qadsl/files/patch-func.c *** qadsl.orig/files/patch-func.c Thu Jun 27 13:44:20 2002 --- qadsl/files/patch-func.c Thu Jan 1 01:00:00 1970 *************** *** 1,17 **** - *** func.c.orig Thu Dec 13 21:45:53 2001 - --- func.c Thu Dec 13 21:47:55 2001 - *************** - *** 48,53 **** - - void usage(char *argv) { - printf("Usage: %s [ -h ] [ -c file ] [ -l ] [ -o ]\n", argv); - ! printf("\t-h\t\tPrint this message\n\t-c file\t\tUse settings from file instead of /etc/qadsl.conf\n\t" - "-l\t\tWill try to login\n\t-o\t\tWill try to logout\n"); - } - --- 48,53 ---- - - void usage(char *argv) { - printf("Usage: %s [ -h ] [ -c file ] [ -l ] [ -o ]\n", argv); - ! printf("\t-h\t\tPrint this message\n\t-c file\t\tUse settings from file instead of " CONF "\n\t" - "-l\t\tWill try to login\n\t-o\t\tWill try to logout\n"); - } --- 0 ---- diff -crN qadsl.orig/files/patch-main.c qadsl/files/patch-main.c *** qadsl.orig/files/patch-main.c Thu Jun 27 13:44:20 2002 --- qadsl/files/patch-main.c Thu Jan 1 01:00:00 1970 *************** *** 1,19 **** - *** main.c.orig Thu Dec 13 21:41:36 2001 - --- main.c Thu Dec 13 21:47:38 2001 - *************** - *** 32,38 **** - char send_msg[MAXDATASIZE], get_msg[MAXDATASIZE]; - char user[MAXLEN], pass[MAXLEN], serv[MAXLEN], deamon_s[MAXLEN], deamon_t[MAXLEN], deamon_d[MAXLEN]; - - ! char *conf="/etc/qadsl.conf"; - - int main(int argc, char *argv[]) - { - --- 32,38 ---- - char send_msg[MAXDATASIZE], get_msg[MAXDATASIZE]; - char user[MAXLEN], pass[MAXLEN], serv[MAXLEN], deamon_s[MAXLEN], deamon_t[MAXLEN], deamon_d[MAXLEN]; - - ! char *conf= CONF; - - int main(int argc, char *argv[]) - { --- 0 ---- diff -crN qadsl.orig/files/patch-man::qadsl.8 qadsl/files/patch-man::qadsl.8 *** qadsl.orig/files/patch-man::qadsl.8 Thu Jan 1 01:00:00 1970 --- qadsl/files/patch-man::qadsl.8 Wed Dec 22 13:54:45 2004 *************** *** 0 **** --- 1,36 ---- + *** man/qadsl.8.orig Mon Jun 28 23:24:05 2004 + --- man/qadsl.8 Sat Sep 11 17:38:11 2004 + *************** + *** 59,65 **** + Use settings from + .I file + insted of default + ! .I /etc/qadsl.conf + or + .I $HOME/.qadslrc + + --- 59,65 ---- + Use settings from + .I file + insted of default + ! .I /usr/local/etc/qadsl.conf + or + .I $HOME/.qadslrc + + *************** + *** 112,118 **** + + .SH FILES + .TP + ! .I /etc/qadsl.conf + Usually the location of a system wide qadsl configuration file. + .TP + .I $HOME/.qadslrc + --- 112,118 ---- + + .SH FILES + .TP + ! .I /usr/local/etc/qadsl.conf + Usually the location of a system wide qadsl configuration file. + .TP + .I $HOME/.qadslrc diff -crN qadsl.orig/files/patch-man::qadsl.conf.5 qadsl/files/patch-man::qadsl.conf.5 *** qadsl.orig/files/patch-man::qadsl.conf.5 Thu Jan 1 01:00:00 1970 --- qadsl/files/patch-man::qadsl.conf.5 Wed Dec 22 13:54:45 2004 *************** *** 0 **** --- 1,19 ---- + *** man/qadsl.conf.5.orig Mon Jun 28 23:24:55 2004 + --- man/qadsl.conf.5 Sat Sep 11 17:38:16 2004 + *************** + *** 29,35 **** + .SH NAME + qadsl.conf \- qadsl configuration file + .SH DESCRIPTION + ! \fBqadsl.conf\fP is usually found in /etc/qadsl.conf and contains + username, password and login server information for your Internet + connection. + + --- 29,35 ---- + .SH NAME + qadsl.conf \- qadsl configuration file + .SH DESCRIPTION + ! \fBqadsl.conf\fP is usually found in /usr/local/etc/qadsl.conf and contains + username, password and login server information for your Internet + connection. + diff -crN qadsl.orig/files/patch-qadsl.sh qadsl/files/patch-qadsl.sh *** qadsl.orig/files/patch-qadsl.sh Thu Jun 27 13:44:20 2002 --- qadsl/files/patch-qadsl.sh Thu Jan 1 01:00:00 1970 *************** *** 1,26 **** - *** /dev/null Thu Dec 13 22:20:21 2001 - --- qadsl.sh Wed Dec 12 21:05:26 2001 - *************** - *** 0 **** - --- 1,21 ---- - + #!/bin/sh - + - + if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then - + echo "$0: Cannot determine the PREFIX" >&2 - + exit 1 - + fi - + - + case "$1" in - + start) - + [ -x ${PREFIX}/sbin/qadsl ] && ( ${PREFIX}/sbin/qadsl -l & ) - + sleep 2 - + ;; - + stop) - + killall qadsl && echo -n ' qadsl' - + ;; - + *) - + echo "Usage: `basename $0` {start|stop}" >&2 - + ;; - + esac - + - + exit 0 --- 0 ---- diff -crN qadsl.orig/files/patch-src::http.c qadsl/files/patch-src::http.c *** qadsl.orig/files/patch-src::http.c Thu Jan 1 01:00:00 1970 --- qadsl/files/patch-src::http.c Wed Dec 22 13:54:45 2004 *************** *** 0 **** --- 1,53 ---- + *** src/http.c.orig Tue Jun 29 23:59:57 2004 + --- src/http.c Sat Sep 11 22:19:22 2004 + *************** + *** 27,33 **** + #include "config.h" + #endif + + ! #include <alloca.h> + #include <netdb.h> + #include <netinet/in.h> + #include <stdio.h> + --- 27,33 ---- + #include "config.h" + #endif + + ! #include <sys/types.h> + #include <netdb.h> + #include <netinet/in.h> + #include <stdio.h> + *************** + *** 278,284 **** + + strlen (config->password_key) + strlen (config->password) + + strlen (config->login_string_footer) + strlen ("Plus approximately 10%"); + + ! temp = (char *) alloca (length); + if (!temp) + { + close (config->sockfd); + --- 278,284 ---- + + strlen (config->password_key) + strlen (config->password) + + strlen (config->login_string_footer) + strlen ("Plus approximately 10%"); + + ! temp = (char *) malloc(length); + if (!temp) + { + close (config->sockfd); + *************** + *** 299,305 **** + + DEBUG ("Login string: %s", temp); + + ! login_string = (char *) alloca (length); + if (!login_string) + { + close (config->sockfd); + --- 299,305 ---- + + DEBUG ("Login string: %s", temp); + + ! login_string = (char *) malloc(length); + if (!login_string) + { + close (config->sockfd); diff -crN qadsl.orig/files/patch-src::lock.c qadsl/files/patch-src::lock.c *** qadsl.orig/files/patch-src::lock.c Thu Jan 1 01:00:00 1970 --- qadsl/files/patch-src::lock.c Wed Dec 22 13:54:45 2004 *************** *** 0 **** --- 1,44 ---- + *** src/lock.c.orig Sat Mar 13 23:39:41 2004 + --- src/lock.c Sat Sep 11 22:05:09 2004 + *************** + *** 153,159 **** + */ + + pid_t + ! lock_read (char **file) + { + int fd, fallback; + FILE *fp; + --- 153,159 ---- + */ + + pid_t + ! lock_read (char *file) + { + int fd, fallback; + FILE *fp; + *************** + *** 165,175 **** + fallback = 0; + do + { + ! fd = open(*file, O_RDONLY); + if (-1 == fd) + { + ! *file = fallback_pid_files [fallback++]; + ! if (NULL == *file) + { + /* This makes us depend on procps and coreutils in GNU/Linux + * but only coreutils in GNU/Hurd. + --- 165,175 ---- + fallback = 0; + do + { + ! fd = open(file, O_RDONLY); + if (-1 == fd) + { + ! file = fallback_pid_files [fallback++]; + ! if (NULL == file) + { + /* This makes us depend on procps and coreutils in GNU/Linux + * but only coreutils in GNU/Hurd. diff -crN qadsl.orig/files/patch-src::log.c qadsl/files/patch-src::log.c *** qadsl.orig/files/patch-src::log.c Thu Jan 1 01:00:00 1970 --- qadsl/files/patch-src::log.c Wed Dec 22 13:54:45 2004 *************** *** 0 **** --- 1,38 ---- + *** src/log.c.orig Thu Jun 10 21:11:46 2004 + --- src/log.c Sat Sep 11 17:42:44 2004 + *************** + *** 21,28 **** + #include "config.h" + #endif + + - #include <alloca.h> + #include <stdio.h> + #include <stdarg.h> + #include <string.h> + #include <syslog.h> + --- 21,28 ---- + #include "config.h" + #endif + + #include <stdio.h> + + #include <stdlib.h> + #include <stdarg.h> + #include <string.h> + #include <syslog.h> + *************** + *** 100,106 **** + char *str; + va_list ap; + + ! str = alloca (MAXDATASIZE); /* XXX - What is this, a hardcoded value?! */ + va_start (ap, fmt); + len = vsnprintf (str, MAXDATASIZE, fmt, ap); + if (len >= 0) + --- 100,106 ---- + char *str; + va_list ap; + + ! str = malloc(MAXDATASIZE); /* XXX - What is this, a hardcoded value?! */ + va_start (ap, fmt); + len = vsnprintf (str, MAXDATASIZE, fmt, ap); + if (len >= 0) diff -crN qadsl.orig/files/qadsl.sh qadsl/files/qadsl.sh *** qadsl.orig/files/qadsl.sh Thu Jan 1 01:00:00 1970 --- qadsl/files/qadsl.sh Wed Dec 22 13:54:45 2004 *************** *** 0 **** --- 1,37 ---- + #!/bin/sh + + # PROVIDE: qadsl + # REQUIRE: NETWORK + # BEFORE: DAEMON SERVERS LOGIN + # KEYWORD: FreeBSD shutdown + + # + # Add the following lines to /etc/rc.conf to enable qadsl: + # + #qadsl_enable="YES" + # + # Configuration flags can be set with qadsl_flags="" + # + # See qadsl(8) for flags. + # + # DO NOT CHANGE THESE DEFAULT VALUES HERE + # + + # Default flags + qadsl_enable=${qadsl_enable-"NO"} + qadsl_flags=${qadsl_flags-"-l"} + qadsl_pidfile=${qadsl_pidfile-"/var/run/qadsl.pid"} + + . %%RC_SUBR%% + + name="qadsl" + rcvar=`set_rcvar` + command=%%PREFIX%%/sbin/qadsl + load_rc_config $name + + pidfile=${qadsl_pidfile} + required_files=%%PREFIX%%/etc/qadsl.conf + + qadsl_flags="${qadsl_flags} -p ${qadsl_pidfile}" + + run_rc_command "$1" diff -crN qadsl.orig/pkg-descr qadsl/pkg-descr *** qadsl.orig/pkg-descr Mon Feb 24 11:37:53 2003 --- qadsl/pkg-descr Wed Dec 22 13:54:45 2004 *************** *** 1,10 **** ! This is a port of qadsl, a small utility to login on the Telia AB ADSL ! service. It also works fine with COMHEM Cable internet. It has ! features like keep-alive daemon, login/logout functions. The ! keep-alive daemon can be configured to either login or to ping your ! login-server after a chosen delay in minutes. ! WWW: http://kuba.unix.se/ -- Arne Lundberg arlu@telia.com --- 1,9 ---- ! qadsl (GNU Alive) is a small utility to login on the Telia AB ADSL service. ! It also works fine with COMHEM Cable internet and Tiscali Internet services. ! It features a keep-alive daemon with login/logout functions. The daemon ! periodically connects to the ISP to ensure you are not logged out. ! WWW: http://savannah.gnu.org/projects/alive -- Arne Lundberg arlu@telia.com diff -crN qadsl.orig/pkg-message qadsl/pkg-message *** qadsl.orig/pkg-message Thu Jun 27 13:44:20 2002 --- qadsl/pkg-message Wed Dec 22 13:54:45 2004 *************** *** 1,7 **** ********************************************************* A sample configuration file has been copied to ! %%PREFIX%%/etc/qadsl.conf.sample. Qadsl will not work without ! %%PREFIX%%/etc/qadsl.conf. ********************************************************* --- 1,19 ---- + ********************************************************* A sample configuration file has been copied to ! %%PREFIX%%/etc/qadsl.conf.sample. ! qadsl (GNU Alive) will NOT work ! without a valid %%PREFIX%%/etc/qadsl.conf. ********************************************************* + + ===> COMPATIBILITY NOTE: + Configuration file from qadsl 1.2 and below + are not compatible with qadsl 1.3.3 or after. + Make sure to edit your configuration properly. + + ===> BE CAREFULL HOW TO BOOT on 1.3.3 or after: + To run qadsl from startup, add qadsl_enable="YES" + in your /etc/rc.conf. + diff -crN qadsl.orig/pkg-plist qadsl/pkg-plist *** qadsl.orig/pkg-plist Thu Jun 27 13:44:20 2002 --- qadsl/pkg-plist Wed Dec 22 13:54:45 2004 *************** *** 1,3 **** --- 1,4 ---- sbin/qadsl etc/qadsl.conf.sample etc/rc.d/qadsl.sh + info/qadsl.info --- end qadsl.diff --- On Wed, Dec 22, 2004 at 09:06:05AM +0100, Volker Stolz (vs@freebsd.org) wrote: > Could you submit the update in unified diff format, please? > > Volker
State Changed From-To: feedback->open Feedback received; no reply from maintainer
State Changed From-To: open->closed Committed with modifications, thanks for your submission! Sorry it took so long. Could you please take a look at updating the port to 1.4, too?