This syncs ipcalc with submitted patches. - pyr
Index: Makefile =================================================================== RCS file: /cvs/ports/net/ipcalc/Makefile,v retrieving revision 1.8 diff -u -p -r1.8 Makefile --- Makefile 19 Oct 2010 21:04:52 -0000 1.8 +++ Makefile 29 Jan 2011 11:20:31 -0000 @@ -2,8 +2,7 @@ COMMENT= small network calculator -DISTNAME= ipcalc-1.3 -REVISION= 0 +DISTNAME= ipcalc-1.4 CATEGORIES= net HOMEPAGE= http://spootnik.org/ipcalc/ Index: distinfo =================================================================== RCS file: /cvs/ports/net/ipcalc/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 24 May 2007 14:02:19 -0000 1.4 +++ distinfo 29 Jan 2011 11:20:31 -0000 @@ -1,5 +1,5 @@ -MD5 (ipcalc-1.3.tar.gz) = C6bKBaBbYsa0KEJ6KiMFVg== -RMD160 (ipcalc-1.3.tar.gz) = QirN8iyD91mjXj0ZnI7MWwA46DI= -SHA1 (ipcalc-1.3.tar.gz) = wi500ensIW/e5uAzAQHyevK6HiQ= -SHA256 (ipcalc-1.3.tar.gz) = rQ3pbHkuORkzx8nayvIumyFcTM6IaSrqkJEwQrsxNtQ= -SIZE (ipcalc-1.3.tar.gz) = 4298 +MD5 (ipcalc-1.4.tar.gz) = dSBIM4X5j8JPAsEkS58uTQ== +RMD160 (ipcalc-1.4.tar.gz) = E3Vhk6X7uFZTNysI01P+sw2YCkA= +SHA1 (ipcalc-1.4.tar.gz) = 9KmhLmtMC+y1g41KEKRXNO8L5WE= +SHA256 (ipcalc-1.4.tar.gz) = b5ikwAXdYNjJkNyeadzH4Z1HShr3V5N/DJoQ/RfvTLc= +SIZE (ipcalc-1.4.tar.gz) = 4965 Index: patches/patch-ipcalc_1 =================================================================== RCS file: patches/patch-ipcalc_1 diff -N patches/patch-ipcalc_1 --- patches/patch-ipcalc_1 3 Apr 2010 21:54:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-ipcalc_1,v 1.1 2010/04/03 21:54:54 sthen Exp $ ---- ipcalc.1.orig Sat Apr 3 22:43:17 2010 -+++ ipcalc.1 Sat Apr 3 22:43:18 2010 -@@ -67,6 +67,7 @@ Operates only on network finding and splitting in whic - detailed information for each network. - .It Fl c - Includes the cisco wildcard syntax in the output where applicable. -+.El - .Sh NETMASKS - Netmasks can be specified in one of three ways: - .Bl -tag -width Ds -@@ -77,3 +78,4 @@ set in the address. - A traditionnal IPv4 address such as 255.255.255.0 - .It Cm hex notation address - An address in hex notation such as 0xffffff00 -+.El Index: patches/patch-ipcalc_c =================================================================== RCS file: patches/patch-ipcalc_c diff -N patches/patch-ipcalc_c --- patches/patch-ipcalc_c 14 Jan 2011 09:53:24 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-ipcalc_c,v 1.1 2011/01/14 09:53:24 eric Exp $ ---- ipcalc.c.orig Thu Jan 13 15:24:39 2011 -+++ ipcalc.c Thu Jan 13 15:27:10 2011 -@@ -233,7 +233,7 @@ split(in_addr_t add, u_char pfxlen, char *masktab, int - err(1, "out of memory"); - tab[0] = i; - } else { -- if ((tab = realloc(tab, sz + 1)) == NULL) -+ if ((tab = realloc(tab, (sz + 1) * sizeof(int))) == NULL) - err(1, "out of memory"); - tab[sz] = i; - }