From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 9 13:21:33 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ADF0116A4CE for ; Fri, 9 Jan 2004 13:21:33 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9712E43D3F for ; Fri, 9 Jan 2004 13:20:23 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i09LKNFR060527 for ; Fri, 9 Jan 2004 13:20:23 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i09LKNLG060526; Fri, 9 Jan 2004 13:20:23 -0800 (PST) (envelope-from gnats) Resent-Date: Fri, 9 Jan 2004 13:20:23 -0800 (PST) Resent-Message-Id: <200401092120.i09LKNLG060526@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Eyal Soha Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 37C1F16A4CE for ; Fri, 9 Jan 2004 13:17:01 -0800 (PST) Received: from rwcrmhc12.comcast.net (rwcrmhc12.comcast.net [216.148.227.85]) by mx1.FreeBSD.org (Postfix) with ESMTP id D663343D2F for ; Fri, 9 Jan 2004 13:16:58 -0800 (PST) (envelope-from esoha@comcast.net) Received: from x1-6-00-50-2c-02-55-54.attbi.com (c-24-6-101-51.client.comcast.net[24.6.101.51]) by comcast.net (rwcrmhc12) with ESMTP id <2004010921165801400ph65se>; Fri, 9 Jan 2004 21:16:58 +0000 Received: from comcast.net (localhost [127.0.0.1])i09LGwT7003818; Fri, 9 Jan 2004 13:16:59 -0800 (PST) (envelope-from esoha@comcast.net) Received: (from esoha@localhost) by comcast.net (8.12.9p1/8.12.9/Submit) id i09LGuJj003817; Fri, 9 Jan 2004 13:16:56 -0800 (PST) (envelope-from esoha) Message-Id: <200401092116.i09LGuJj003817@comcast.net> Date: Fri, 9 Jan 2004 13:16:56 -0800 (PST) From: Eyal Soha To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/61141: [maintainer update] [patch] dns/noip upgrade 2.0.12 -> 2.1.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Eyal Soha List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Jan 2004 21:21:33 -0000 >Number: 61141 >Category: ports >Synopsis: [maintainer update] [patch] dns/noip upgrade 2.0.12 -> 2.1.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jan 09 13:20:23 PST 2004 >Closed-Date: >Last-Modified: >Originator: Eyal Soha >Release: FreeBSD 5.1-RELEASE-p11 i386 >Organization: >Environment: System: FreeBSD x1-6-00-50-2c-02-55-54.attbi.com 5.1-RELEASE-p11 FreeBSD 5.1-RELEASE-p11 #8: Mon Jan 5 07:03:39 PST 2004 esoha@x1-6-00-50-2c-02-55-54.attbi.com:/usr/obj/usr/src/sys/EYAL i386 >Description: Dan Durrer of No-IP.com informed me of the new noip version so I upgraded the port. >How-To-Repeat: >Fix: I did the testing specified by the Porter's Handbook and also showed my changes to Dan Larsson, who upgraded from version 1.6 to 2.0.12 while I was off on vacation. Here's a list of the changes to the port: 1) PORTVERSION updated from 2.0.12 to 2.1.0 2) PREFIX/share/doc/PORTNAME changed to DOCSDIR in Makefile and pkg-plist, to conform better 3) patch-noip2.c functionally identical, but regenerated so that the line numbers and context are more accurate. 4) two occurances of "no-ip.conf" in pkg-deinstall changed to "no-ip2.conf" --- noip.diff begins here --- diff -ruN noip.bak/Makefile noip/Makefile --- noip.bak/Makefile Thu Jan 8 14:17:22 2004 +++ noip/Makefile Thu Jan 8 15:36:30 2004 @@ -6,7 +6,7 @@ # PORTNAME= noip -PORTVERSION= 2.0.12 +PORTVERSION= 2.1.0 CATEGORIES= dns MASTER_SITES= http://www.no-ip.com/client/linux/ @@ -26,9 +26,9 @@ ${INSTALL_PROGRAM} ${WRKSRC}/noip2 ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/noip.sh ${PREFIX}/etc/rc.d .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/${PORTNAME} - ${INSTALL_MAN} ${WRKSRC}/README.FIRST ${PREFIX}/share/doc/${PORTNAME} - ${INSTALL_MAN} ${WRKSRC}/COPYING ${PREFIX}/share/doc/${PORTNAME} + ${MKDIR} ${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/README.FIRST ${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/COPYING ${DOCSDIR} .endif @${SED} "s|%%PREFIX%%|${PREFIX}|g" ${PKGMESSAGE} | ${SED} "s|%%WRKSRC%%|${WRKSRC}|g" diff -ruN noip.bak/distinfo noip/distinfo --- noip.bak/distinfo Thu Jan 8 14:17:22 2004 +++ noip/distinfo Thu Jan 8 14:26:31 2004 @@ -1 +1 @@ -MD5 (noip-2.0.12.tar.gz) = 72053672a5125d39b861a130aa4532f1 +MD5 (noip-2.1.0.tar.gz) = 59d26e089a2bff15f512d808dad2cd1c diff -ruN noip.bak/files/patch-noip2.c noip/files/patch-noip2.c --- noip.bak/files/patch-noip2.c Thu Jan 8 14:17:22 2004 +++ noip/files/patch-noip2.c Thu Jan 8 14:46:14 2004 @@ -1,15 +1,15 @@ ---- noip2.c.orig Sat May 24 00:55:14 2003 -+++ noip2.c Fri Aug 29 10:50:06 2003 -@@ -141,7 +141,7 @@ +--- noip2.c.orig Fri Jan 2 18:14:09 2004 ++++ noip2.c Thu Jan 8 14:45:57 2004 +@@ -153,7 +153,7 @@ + #define CLIENT_IP_PORT 8245 - #define VERSION "2.0.12" - #define NOIP_NAME "dynupdate.no-ip.com" --#define USER_AGENT "User-Agent: Linux DUC "VERSION -+#define USER_AGENT "User-Agent: FreeBSD DUC "VERSION + #define VERSION "2.1" +-#define USER_AGENT "User-Agent: Linux-DUC/"VERSION ++#define USER_AGENT "User-Agent: FreeBSD-DUC/"VERSION #define SETTING_SCRIPT "settings.php?" #define USTRNG "username=" #define PWDSTRNG "&pass=" -@@ -246,7 +246,7 @@ +@@ -258,7 +258,7 @@ #define CMSG21 "Please select the Internet interface from this list.\n" #define CMSG22 "By typing the number associated with it." #define CMSG23 "Too many network devices. Limit is %d" @@ -18,7 +18,7 @@ #define CMSG25 "Can't create config file (%s)" #define CMSG25a "Re-run noip, adding '-c configfilename' as a parameter." #define CMSG26 "Can't rename config file (%s)" -@@ -438,7 +438,7 @@ +@@ -450,7 +450,7 @@ fprintf(stderr, "[ -d][ -D pid]"); #endif fprintf(stderr, "[ -i addr][ -S][ -M][ -h]"); @@ -27,9 +27,12 @@ fprintf(stderr, "Options: -C create configuration data\n"); fprintf(stderr, " -F force NAT off\n"); fprintf(stderr, " -Y select all hosts/groups\n"); -@@ -1884,12 +1884,10 @@ +@@ -1935,17 +1935,12 @@ + dq = devs; // point at name list for (ifa = ifap; ifa; ifa = ifa->ifa_next) { if (ifa->ifa_addr->sa_family == AF_LINK) { +-// FreeBSD doesn't define some of these! +-#ifdef IFT_PFLOG struct if_data *ifd = (struct if_data *) ifa->ifa_data; - if (ifd->ifi_type == IFT_PFLOG - || ifd->ifi_type == IFT_PFSYNC @@ -38,9 +41,11 @@ - || ifd->ifi_type == IFT_OTHER - || ifd->ifi_type == IFT_GIF) + if (ifd->ifi_type == IFT_OTHER -+ || ifd->ifi_type == IFT_GIF -+ || ifd->ifi_type == IFT_LOOP -+ || ifd->ifi_type == IFT_FAITH) ++ || ifd->ifi_type == IFT_GIF ++ || ifd->ifi_type == IFT_LOOP ++ || ifd->ifi_type == IFT_FAITH) continue; +-#endif q = dq; // add new name into list p = ifa->ifa_name; + devnum++; diff -ruN noip.bak/pkg-deinstall noip/pkg-deinstall --- noip.bak/pkg-deinstall Thu Jan 8 14:17:22 2004 +++ noip/pkg-deinstall Thu Jan 8 15:52:52 2004 @@ -8,9 +8,8 @@ ECHO=echo USER=noip GROUP=${USER} - -if [ -f ${PKG_PREFIX}/etc/no-ip.conf ]; then - ${ECHO} "To delete noip configuration permanently: rm ${PKG_PREFIX}/etc/no-ip.conf" +if [ -f ${PKG_PREFIX}/etc/no-ip2.conf ]; then + ${ECHO} "To delete noip configuration permanently: rm ${PKG_PREFIX}/etc/no-ip2.conf" fi if ${PW} usershow "${USER}" 2>/dev/null 1>&2; then ${ECHO} "To delete noip user permanently: ${PW} userdel ${USER}" diff -ruN noip.bak/pkg-plist noip/pkg-plist --- noip.bak/pkg-plist Thu Jan 8 14:17:22 2004 +++ noip/pkg-plist Thu Jan 8 14:22:04 2004 @@ -1,5 +1,5 @@ bin/noip2 etc/rc.d/noip.sh -%%PORTDOCS%%share/doc/noip/README.FIRST -%%PORTDOCS%%share/doc/noip/COPYING -%%PORTDOCS%%@dirrm share/doc/noip +%%PORTDOCS%%%%DOCSDIR%%/README.FIRST +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%@dirrm %%DOCSDIR%% --- noip.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: