From b41e4b82b7c159d3d3212252a6304dd87a91be31 Mon Sep 17 00:00:00 2001
From: Kirill Ponomarev <krion@FreeBSD.org>
Date: Sun, 5 Oct 2003 19:59:13 +0000
Subject: - Update to version 2.0.12 - Approved by maintainer
PR: 56180
Submitted by: Dan Larsson <ports@tyfon.net>
---
dns/noip/files/noip.sh | 6 +++---
dns/noip/files/patch-Makefile | 35 ++++++++++++++++++++++++++++++++
dns/noip/files/patch-no-ip.sh | 16 ---------------
dns/noip/files/patch-noip.c | 12 -----------
dns/noip/files/patch-noip2.c | 46 +++++++++++++++++++++++++++++++++++++++++++
5 files changed, 84 insertions(+), 31 deletions(-)
create mode 100644 dns/noip/files/patch-Makefile
delete mode 100644 dns/noip/files/patch-no-ip.sh
delete mode 100644 dns/noip/files/patch-noip.c
create mode 100644 dns/noip/files/patch-noip2.c
(limited to 'dns/noip/files')
diff --git a/dns/noip/files/noip.sh b/dns/noip/files/noip.sh
index eca1af8323b8..285a62718385 100644
--- a/dns/noip/files/noip.sh
+++ b/dns/noip/files/noip.sh
@@ -2,14 +2,14 @@
case "$1" in
start)
- if [ -x %%PREFIX%%/bin/noip -a -f %%PREFIX%%/etc/no-ip.conf ]; then
+ if [ -x %%PREFIX%%/bin/noip2 -a -f %%PREFIX%%/etc/no-ip2.conf ]; then
echo -n ' noip';
- su -m noip -c '%%PREFIX%%/bin/noip' 2> /dev/null > /dev/null
+ su -m noip -c '%%PREFIX%%/bin/noip2' 2> /dev/null > /dev/null
fi
;;
stop)
echo -n ' noip';
- killall noip
+ killall noip2
;;
*)
echo "Usage: `basename $0` {start|stop}" >&2
diff --git a/dns/noip/files/patch-Makefile b/dns/noip/files/patch-Makefile
new file mode 100644
index 000000000000..de226c616f08
--- /dev/null
+++ b/dns/noip/files/patch-Makefile
@@ -0,0 +1,35 @@
+--- Makefile.orig Thu May 8 23:13:28 2003
++++ Makefile Fri Aug 29 10:22:57 2003
+@@ -1,16 +1,16 @@
+ TGT=noip2
+-CC=gcc
++MYCC=${CC}
+
+-PREFIX=/usr/local
+-CONFDIR=${PREFIX}/etc
+-BINDIR=${PREFIX}/bin
++MYPREFIX=${PREFIX}
++CONFDIR=${MYPREFIX}/etc
++BINDIR=${MYPREFIX}/bin
+
+ # these defines are for Linux
+-LIBS=
+-ARCH=linux
++#LIBS=
++#ARCH=linux
+
+ # for BSD systems that have getifaddr(), uncomment the next line
+-#ARCH=bsd_with_getifaddrs
++ARCH=bsd_with_getifaddrs
+
+ # for early BSD systems without getifaddrs(), uncomment the next line
+ #ARCH=bsd
+@@ -21,7 +21,7 @@
+ # ARCH=sun
+
+ ${TGT}: Makefile ${TGT}.c
+- ${CC} -Wall -g -O2 -D${ARCH} -DPREFIX=\"${PREFIX}\" ${TGT}.c -o ${TGT} ${LIBS}
++ ${MYCC} ${CFLAGS} -D${ARCH} -DPREFIX=\"${MYPREFIX}\" ${TGT}.c -o ${TGT} ${LIBS}
+
+ install: ${TGT}
+ if [ ! -d ${BINDIR} ]; then mkdir -p ${BINDIR};fi
diff --git a/dns/noip/files/patch-no-ip.sh b/dns/noip/files/patch-no-ip.sh
deleted file mode 100644
index 4d083a0ec7b6..000000000000
--- a/dns/noip/files/patch-no-ip.sh
+++ /dev/null
@@ -1,16 +0,0 @@
---- no-ip.sh.orig Wed Oct 10 16:35:12 2001
-+++ no-ip.sh Fri Mar 29 01:55:11 2002
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- #
- # configuration file builder script for no-ip
- #
-@@ -89,7 +90,7 @@
- #
- if [ "$NAT" = "N" ]
- then
-- devs=`tail +3 /proc/net/dev | awk -F: '{print $1}' | tr -d ' '|tr '\n' ' '`
-+ devs=`ifconfig -l inet`
- DEV=foo
- while [ "$DEV" = "foo" ]
- do
diff --git a/dns/noip/files/patch-noip.c b/dns/noip/files/patch-noip.c
deleted file mode 100644
index 04b51cdfffd6..000000000000
--- a/dns/noip/files/patch-noip.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- noip.c.bak Sat Mar 30 17:59:58 2002
-+++ noip.c Sat Mar 30 17:59:15 2002
-@@ -452,7 +452,8 @@
- else
- getip(IPaddress);
- #ifdef DEBUG
-- ErrMsg("! LIA = %s, IP = %s",Last_IP_Addr, IPaddress);
-+ if (debug)
-+ ErrMsg("! LIA = %s, IP = %s",Last_IP_Addr, IPaddress);
- #endif
- if ((*IPaddress != 0) &&
- (strcmp(IPaddress, Last_IP_Addr) != 0)) {
diff --git a/dns/noip/files/patch-noip2.c b/dns/noip/files/patch-noip2.c
new file mode 100644
index 000000000000..8ddeeaad96d4
--- /dev/null
+++ b/dns/noip/files/patch-noip2.c
@@ -0,0 +1,46 @@
+--- noip2.c.orig Sat May 24 00:55:14 2003
++++ noip2.c Fri Aug 29 10:50:06 2003
+@@ -141,7 +141,7 @@
+
+ #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 SETTING_SCRIPT "settings.php?"
+ #define USTRNG "username="
+ #define PWDSTRNG "&pass="
+@@ -246,7 +246,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"
+-#define CMSG24 "\nAuto configuration for Linux client of no-ip.com.\n"
++#define CMSG24 "\nAuto configuration for FreeBSD client of no-ip.com.\n"
+ #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 @@
+ fprintf(stderr, "[ -d][ -D pid]");
+ #endif
+ fprintf(stderr, "[ -i addr][ -S][ -M][ -h]");
+- fprintf(stderr, "\n\nVersion Linux-%s\n", VERSION);
++ fprintf(stderr, "\n\nVersion FreeBSD-%s\n", VERSION);
+ 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 @@
+ for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
+ if (ifa->ifa_addr->sa_family == AF_LINK) {
+ struct if_data *ifd = (struct if_data *) ifa->ifa_data;
+- if (ifd->ifi_type == IFT_PFLOG
+- || ifd->ifi_type == IFT_PFSYNC
+- || ifd->ifi_type == IFT_ENC
+- || ifd->ifi_type == IFT_BRIDGE
+- || 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)
+ continue;
+ q = dq; // add new name into list
+ p = ifa->ifa_name;
--
cgit v1.2.3