Attachment #101221 for bug #140643

View | Details | Raw Unified | Return to bug 140643
Collapse All | Expand All

Lines 6-15 Link Here

(-)Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= noip	8	PORTNAME= noip
9	PORTVERSION= 2.1.7	9	PORTVERSION= 2.1.9
10	PORTREVISION= 2
11	CATEGORIES= dns	10	CATEGORIES= dns
12	MASTER_SITES= http://www.no-ip.com/client/linux/	11	MASTER_SITES= http://www.no-ip.com/client/linux/ \
		12	CRITICAL
13		13
14	MAINTAINER= kay.abendroth@raxion.net	14	MAINTAINER= kay.abendroth@raxion.net
15	COMMENT= No-IP.com's dynamic DNS update client	15	COMMENT= No-IP.com's dynamic DNS update client

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (noip-2.1.7.tar.gz) = 7b6b64c08708c2b147c375dda074a8dc	1	MD5 (noip-2.1.9.tar.gz) = eed8e9ef9edfb7ddc36e187de867fe64
2	SHA256 (noip-2.1.7.tar.gz) = 1105a23cb0a957c4b1e7c47bd9bfed00f1a089bdddd2a69f69bf4f8047f7a237	2	SHA256 (noip-2.1.9.tar.gz) = 86ad0a6362263a33f59a658d1b1ce428e255556ddad0d062aa0ee4b7f412f98a
3	SIZE (noip-2.1.7.tar.gz) = 147640	3	SIZE (noip-2.1.9.tar.gz) = 152995




--- Makefile.orig	2009-11-17 20:19:54.000000000 +0100
+++ Makefile	2009-11-17 20:22:51.000000000 +0100
@@ -1,8 +1,8 @@
 TGT=noip2
-CC=gcc
+CC?=gcc
 PKG=noip-2.1.tgz
 
-PREFIX=/usr/local
+PREFIX?=/usr/local
 CONFDIR=${PREFIX}/etc
 BINDIR=${PREFIX}/bin
 
@@ -11,7 +11,7 @@
 ARCH=linux
 # these defines are for Linux
-LIBS=
-ARCH=linux
+#LIBS=
+#ARCH=linux
 
 # for Mac OS X and 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
@@ -22,7 +22,7 @@
 # ARCH=sun
 
 ${TGT}: Makefile ${TGT}.c 
-	${CC} -Wall -g -D${ARCH} -DPREFIX=\"${PREFIX}\" ${TGT}.c -o ${TGT} ${LIBS}
+	${CC} -Wall -D${ARCH} -DPREFIX=\"${PREFIX}\" ${TGT}.c -o ${TGT} ${LIBS}
 
 install: ${TGT} 
 	if [ ! -d ${BINDIR} ]; then mkdir -p ${BINDIR};fi




--- noip2.c.orig	2009-11-17 20:23:40.000000000 +0100
+++ noip2.c	2009-11-17 20:27:45.000000000 +0100
@@ -198,7 +198,7 @@
 #define CLIENT_IP_PORT		8245
 
 #define VERSION			"2.1.9"
-#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="
@@ -308,7 +308,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 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)"
@@ -525,7 +525,7 @@
         fprintf(stderr, "[ -d][ -D pid]");
 #endif                                                                          
 	fprintf(stderr, "[ -i addr][ -S][ -M][ -h]");

 	fprintf(stderr, "Options: -C               create configuration data\n");
 	fprintf(stderr, "         -F               force NAT off\n");
 	fprintf(stderr, "         -Y               select all hosts/groups\n");
@@ -2316,17 +2316,14 @@
 	dq = (unsigned char *)devs;     // point at name list
 	for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
 		if (ifa->ifa_addr->sa_family == AF_LINK) {

-				 || ifd->ifi_type == IFT_BRIDGE
-				 || ifd->ifi_type == IFT_OTHER
-				 || ifd->ifi_type == IFT_GIF)
-		 	   continue;
+				 || ifd->ifi_type == IFT_GIF
+				 || ifd->ifi_type == IFT_LOOP
+				 || ifd->ifi_type == IFT_FAITH)
 		 	   continue;
-#endif
+
+			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;
 			devnum++;

Return to bug 140643

Lines 1-31 Link Here

(-)files/patch-Makefile (-19 / +19 lines)
1	--- Makefile.orig 2007-08-11 20:35:34.000000000 +0200	1	--- Makefile.orig 2009-11-17 20:19:54.000000000 +0100
2	+++ Makefile 2007-12-24 12:18:38.000000000 +0100	2	+++ Makefile 2009-11-17 20:22:51.000000000 +0100
3	@@ -1,13 +1,13 @@	3	@@ -1,8 +1,8 @@
4	TGT=noip2	4	TGT=noip2
5	-CC=gcc	5	-CC=gcc
6	+MYCC=${CC}	6	+CC?=gcc
		7	PKG=noip-2.1.tgz
7		8
8	-PREFIX=/usr/local	9	-PREFIX=/usr/local
9	-CONFDIR=${PREFIX}/etc	10	+PREFIX?=/usr/local
10	-BINDIR=${PREFIX}/bin	11	CONFDIR=${PREFIX}/etc
11	+MYPREFIX=${PREFIX}	12	BINDIR=${PREFIX}/bin
12	+MYCONFDIR=${PREFIX}/etc	13
13	+MYBINDIR=${PREFIX}/bin	14	@@ -11,7 +11,7 @@
14		15	ARCH=linux
15	# these defines are for Linux
16	-LIBS=
17	-ARCH=linux
18	+#LIBS=
19	+#ARCH=linux
20		16
21	# for Mac OS X and BSD systems that have getifaddr(), uncomment the next line	17	# for Mac OS X and BSD systems that have getifaddr(), uncomment the next line
22	#ARCH=bsd_with_getifaddrs	18	-#ARCH=bsd_with_getifaddrs
23	@@ -21,7 +21,7 @@	19	+ARCH=bsd_with_getifaddrs
		20
		21	# for early BSD systems without getifaddrs(), uncomment the next line
		22	#ARCH=bsd
		23	@@ -22,7 +22,7 @@
24	# ARCH=sun	24	# ARCH=sun
25		25
26	${TGT}: Makefile ${TGT}.c	26	${TGT}: Makefile ${TGT}.c
27	- ${CC} -Wall -g -O2 -D${ARCH} -DPREFIX=\"${PREFIX}\" ${TGT}.c -o ${TGT} ${LIBS}	27	- ${CC} -Wall -g -D${ARCH} -DPREFIX=\"${PREFIX}\" ${TGT}.c -o ${TGT} ${LIBS}
28	+ ${MYCC} ${CFLAGS} -Dbsd_with_getifaddrs -DPREFIX=\"${MYPREFIX}\" ${TGT}.c -o ${TGT} ${LIBS}	28	+ ${CC} -Wall -D${ARCH} -DPREFIX=\"${PREFIX}\" ${TGT}.c -o ${TGT} ${LIBS}
29		29
30	install: ${TGT}	30	install: ${TGT}
31	if [ ! -d ${BINDIR} ]; then mkdir -p ${BINDIR};fi	31	if [ ! -d ${BINDIR} ]; then mkdir -p ${BINDIR};fi

Lines 1-15 Link Here

(-)files/patch-noip2.c (-12 / +15 lines)
1	--- noip2.c.orig 2007-08-27 23:54:19.000000000 +0200	1	--- noip2.c.orig 2009-11-17 20:23:40.000000000 +0100
2	+++ noip2.c 2007-12-24 12:25:18.000000000 +0100	2	+++ noip2.c 2009-11-17 20:27:45.000000000 +0100
3	@@ -185,7 +185,7 @@	3	@@ -198,7 +198,7 @@
4	#define CLIENT_IP_PORT 8245	4	#define CLIENT_IP_PORT 8245
5		5
6	#define VERSION "2.1.7"	6	#define VERSION "2.1.9"
7	-#define USER_AGENT "User-Agent: Linux-DUC/"VERSION	7	-#define USER_AGENT "User-Agent: Linux-DUC/"VERSION
8	+#define USER_AGENT "User-Agent: FreeBSD-DUC/"VERSION	8	+#define USER_AGENT "User-Agent: FreeBSD-DUC/"VERSION
9	#define SETTING_SCRIPT "settings.php?"	9	#define SETTING_SCRIPT "settings.php?"
10	#define USTRNG "username="	10	#define USTRNG "username="
11	#define PWDSTRNG "&pass="	11	#define PWDSTRNG "&pass="
12	@@ -292,7 +292,7 @@	12	@@ -308,7 +308,7 @@
13	#define CMSG21 "Please select the Internet interface from this list.\n"	13	#define CMSG21 "Please select the Internet interface from this list.\n"
14	#define CMSG22 "By typing the number associated with it."	14	#define CMSG22 "By typing the number associated with it."
15	#define CMSG23 "Too many network devices. Limit is %d"	15	#define CMSG23 "Too many network devices. Limit is %d"
Lines 18-24 Link Here
18	#define CMSG25 "Can't create config file (%s)"	18	#define CMSG25 "Can't create config file (%s)"
19	#define CMSG25a "Re-run noip, adding '-c configfilename' as a parameter."	19	#define CMSG25a "Re-run noip, adding '-c configfilename' as a parameter."
20	#define CMSG26 "Can't rename config file (%s)"	20	#define CMSG26 "Can't rename config file (%s)"
21	@@ -502,7 +502,7 @@	21	@@ -525,7 +525,7 @@
22	fprintf(stderr, "[ -d][ -D pid]");	22	fprintf(stderr, "[ -d][ -D pid]");
23	#endif	23	#endif
24	fprintf(stderr, "[ -i addr][ -S][ -M][ -h]");	24	fprintf(stderr, "[ -i addr][ -S][ -M][ -h]");
Lines 27-33 Link Here
27	fprintf(stderr, "Options: -C create configuration data\n");	27	fprintf(stderr, "Options: -C create configuration data\n");
28	fprintf(stderr, " -F force NAT off\n");	28	fprintf(stderr, " -F force NAT off\n");
29	fprintf(stderr, " -Y select all hosts/groups\n");	29	fprintf(stderr, " -Y select all hosts/groups\n");
30	@@ -2119,17 +2119,12 @@	30	@@ -2316,17 +2316,14 @@
31	dq = (unsigned char *)devs; // point at name list	31	dq = (unsigned char *)devs; // point at name list
32	for (ifa = ifap; ifa; ifa = ifa->ifa_next) {	32	for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
33	if (ifa->ifa_addr->sa_family == AF_LINK) {	33	if (ifa->ifa_addr->sa_family == AF_LINK) {
Lines 40-51 Link Here
40	- \|\| ifd->ifi_type == IFT_BRIDGE	40	- \|\| ifd->ifi_type == IFT_BRIDGE
41	- \|\| ifd->ifi_type == IFT_OTHER	41	- \|\| ifd->ifi_type == IFT_OTHER
42	- \|\| ifd->ifi_type == IFT_GIF)	42	- \|\| ifd->ifi_type == IFT_GIF)
43	+ if (ifd->ifi_type == IFT_OTHER	43	- continue;
44	+ \|\| ifd->ifi_type == IFT_GIF
45	+ \|\| ifd->ifi_type == IFT_LOOP
46	+ \|\| ifd->ifi_type == IFT_FAITH)
47	continue;
48	-#endif	44	-#endif
		45	+
		46	+ if (ifd->ifi_type == IFT_OTHER
		47	+ \|\| ifd->ifi_type == IFT_GIF
		48	+ \|\| ifd->ifi_type == IFT_LOOP
		49	+ \|\| ifd->ifi_type == IFT_FAITH)
		50	+ continue;
		51	+
49	q = dq; // add new name into list	52	q = dq; // add new name into list
50	p = ifa->ifa_name;	53	p = ifa->ifa_name;
51	devnum++;	54	devnum++;