pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Update ipv6calc to 0.48. Changes:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3cf0263aa05b
branches:  trunk
changeset: 484062:3cf0263aa05b
user:      hubertf <hubertf%pkgsrc.org@localhost>
date:      Tue Nov 23 21:32:11 2004 +0000

description:
Update ipv6calc to 0.48. Changes:

Major changes:

 Update databases

 General:
  - replace md5 function from openssl with a copy of coreutils (licence issue)
  - add support for IEEE/iab.txt database
 ipv6calc:
  - add support for recognizing 6to4 addresses generated by
     Microsoft OS
 ipv6logconv:
  - add support for recognizing 6to4 addresses generated by
     Microsoft OS
  - add support for ISATAP addresses

diffstat:

 doc/CHANGES                   |   3 +-
 net/ipv6calc/Makefile         |   5 +-
 net/ipv6calc/PLIST            |   5 ++-
 net/ipv6calc/distinfo         |  10 ++--
 net/ipv6calc/patches/patch-aa |  85 +++++++++++++++++++++++++++++++++++-------
 net/ipv6calc/patches/patch-ab |  16 ++++----
 6 files changed, 92 insertions(+), 32 deletions(-)

diffs (175 lines):

diff -r 9f3bbf73bf13 -r 3cf0263aa05b doc/CHANGES
--- a/doc/CHANGES       Tue Nov 23 21:15:40 2004 +0000
+++ b/doc/CHANGES       Tue Nov 23 21:32:11 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.7964 2004/11/23 20:25:51 markd Exp $
+$NetBSD: CHANGES,v 1.7965 2004/11/23 21:32:11 hubertf Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -5399,3 +5399,4 @@
        Updated xinvest to 2.6.9 [wiz 2004-11-23]
        Updated antiword to 0.36 [wiz 2004-11-23]
        Updated koffice to 1.3.5 [markd 2004-11-23]
+       Updated ipv6calc to 0.48 [hubertf 2004-11-23]
diff -r 9f3bbf73bf13 -r 3cf0263aa05b net/ipv6calc/Makefile
--- a/net/ipv6calc/Makefile     Tue Nov 23 21:15:40 2004 +0000
+++ b/net/ipv6calc/Makefile     Tue Nov 23 21:32:11 2004 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2004/10/03 00:17:53 tv Exp $
+# $NetBSD: Makefile,v 1.25 2004/11/23 21:32:11 hubertf Exp $
 #
 
-DISTNAME=      ipv6calc-0.46
-PKGREVISION=   3
+DISTNAME=      ipv6calc-0.48
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/
 
diff -r 9f3bbf73bf13 -r 3cf0263aa05b net/ipv6calc/PLIST
--- a/net/ipv6calc/PLIST        Tue Nov 23 21:15:40 2004 +0000
+++ b/net/ipv6calc/PLIST        Tue Nov 23 21:32:11 2004 +0000
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2003/10/14 23:46:46 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/11/23 21:32:11 hubertf Exp $
 bin/ipv6calc
 bin/ipv6logconv
 bin/ipv6logstats
+man/man8/ipv6calc.8
+man/man8/ipv6logconv.8
+man/man8/ipv6logstats.8
diff -r 9f3bbf73bf13 -r 3cf0263aa05b net/ipv6calc/distinfo
--- a/net/ipv6calc/distinfo     Tue Nov 23 21:15:40 2004 +0000
+++ b/net/ipv6calc/distinfo     Tue Nov 23 21:32:11 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2003/10/14 23:46:46 hubertf Exp $
+$NetBSD: distinfo,v 1.11 2004/11/23 21:32:11 hubertf Exp $
 
-SHA1 (ipv6calc-0.46.tar.gz) = d4d03adda9b26cbca906fcfb3fa3658c251cced9
-Size (ipv6calc-0.46.tar.gz) = 338497 bytes
-SHA1 (patch-aa) = 891f1c3cf286d2d21403721475540fc7dc29d6ef
-SHA1 (patch-ab) = 0d09d6f7e1857640a7c81e4a8345106210555a79
+SHA1 (ipv6calc-0.48.tar.gz) = 49a46b49f8ba0badaae9d900645a9e98f2933895
+Size (ipv6calc-0.48.tar.gz) = 456796 bytes
+SHA1 (patch-aa) = 0b15bca3b30bc6848618915439af0cfec53516d8
+SHA1 (patch-ab) = 1ee4112744e6c66c87b5b73ef028da7a77d3c689
diff -r 9f3bbf73bf13 -r 3cf0263aa05b net/ipv6calc/patches/patch-aa
--- a/net/ipv6calc/patches/patch-aa     Tue Nov 23 21:15:40 2004 +0000
+++ b/net/ipv6calc/patches/patch-aa     Tue Nov 23 21:32:11 2004 +0000
@@ -1,20 +1,77 @@
-$NetBSD: patch-aa,v 1.7 2003/10/14 23:46:46 hubertf Exp $
+$NetBSD: patch-aa,v 1.8 2004/11/23 21:32:11 hubertf Exp $
 
---- Makefile.in.orig   Sat Sep  6 15:15:17 2003
+--- Makefile.in.orig   2004-11-21 17:03:11.000000000 +0100
 +++ Makefile.in
-@@ -55,11 +55,10 @@ install:
-               make installonly
+@@ -32,7 +32,10 @@ distclean:
+               make clean
+               rm -f config.cache config.status config.log
+               for dir in ipv6logconv ipv6logstats ipv6calcweb ipv6calc man lib md5 getopt databases/ieee-oui databases/ipv4-assignment; do \
+-                      pushd $$dir && make distclean; popd; \
++                      ocwd=`pwd`; \
++                      cd $$dir; \
++                      make $@ ; \
++                      cd $$ocwd ; \
+               done
+ 
+ autoclean:
+@@ -42,12 +45,18 @@ autoclean:
+               rm -f contrib/ipv6calc.spec
+               rm config.h
+               for dir in ipv6logconv ipv6logstats ipv6calcweb ipv6calc man lib md5 getopt; do \
+-                      pushd $$dir && make autoclean; popd;\
++                      ocwd=`pwd`; \
++                      cd $$dir; \
++                      make $@ ; \
++                      cd $$ocwd ; \
+               done
+ 
+ clean:
+               for dir in ipv6logconv ipv6logstats ipv6calcweb ipv6calc man lib md5 getopt; do \
+-                      pushd $$dir && make clean; popd; \
++                      ocwd=`pwd`; \
++                      cd $$dir; \
++                      make $@ ; \
++                      cd $$ocwd ; \
+               done
+ 
+ install:
+@@ -56,7 +65,10 @@ install:
  
  installonly:
--              mkdir -p $(root)/bin/
--              install -m 755 ipv6calc/ipv6calc $(root)/bin/
--              mkdir -p $(root)/usr/bin/
--              install -m 755 ipv6logconv/ipv6logconv $(root)/usr/bin/
--              install -m 755 ipv6logstats/ipv6logstats $(root)/usr/bin/
-+              ${BSD_INSTALL_PROGRAM_DIR} $(PREFIX)/bin
-+              ${BSD_INSTALL_PROGRAM} ipv6calc/ipv6calc $(PREFIX)/bin
-+              ${BSD_INSTALL_PROGRAM} ipv6logconv/ipv6logconv $(PREFIX)/bin
-+              ${BSD_INSTALL_PROGRAM} ipv6logstats/ipv6logstats $(PREFIX)/bin
+               for dir in ipv6logconv ipv6logstats ipv6calcweb ipv6calc man lib md5 getopt; do \
+-                      pushd $$dir && make install; popd; \
++                      ocwd=`pwd`; \
++                      cd $$dir; \
++                      make install ; \
++                      cd $$ocwd ; \
+               done
  
  getopt-make:
-               cd getopt/ && make
+@@ -91,15 +103,24 @@ db-ipv4-assignment-make:
+ 
+ update:
+               for dir in databases/ieee-oui databases/ieee-iab databases/ipv4-assignment; do \
+-                      pushd $$dir && make update; popd; \
++                      ocwd=`pwd`; \
++                      cd $$dir; \
++                      make $@ ; \
++                      cd $$ocwd ; \
+               done
+ 
+ static:               ipv6logconv-make ipv6logstats-make ipv6calc-make        
+               for dir in ipv6logconv ipv6logstats ipv6calc; do \
+-                      pushd $$dir && make static; popd; \
++                      ocwd=`pwd`; \
++                      cd $$dir; \
++                      make $@ ; \
++                      cd $$ocwd ; \
+               done
+ 
+ test:
+               for dir in ipv6logconv ipv6logstats ipv6calcweb ipv6calc man lib; do \
+-                      pushd $$dir && make test; popd; \
++                      ocwd=`pwd`; \
++                      cd $$dir; \
++                      make $@ ; \
++                      cd $$ocwd ; \
+               done
diff -r 9f3bbf73bf13 -r 3cf0263aa05b net/ipv6calc/patches/patch-ab
--- a/net/ipv6calc/patches/patch-ab     Tue Nov 23 21:15:40 2004 +0000
+++ b/net/ipv6calc/patches/patch-ab     Tue Nov 23 21:32:11 2004 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2003/02/06 14:34:58 tron Exp $
+$NetBSD: patch-ab,v 1.2 2004/11/23 21:32:11 hubertf Exp $
 
---- ipv6calc/Makefile.orig     Sat Apr 20 17:49:40 2002
-+++ ipv6calc/Makefile  Thu Feb  6 15:33:38 2003
-@@ -36,7 +36,7 @@
+--- ipv6calc/Makefile.in.orig  2004-11-21 17:03:12.000000000 +0100
++++ ipv6calc/Makefile.in
+@@ -35,7 +35,7 @@ libipv6calc.a:       
+               cd ../ && make lib-make
  
  ipv6calc:     $(OBJS) libipv6calc.a ../lib/ipv6calcoptions.h
-               echo "Compile: ipv6calc"
--              $(CC) -o ipv6calc $(OBJS) $(GETOBJS) -lipv6calc -L../lib/ -lcrypto
-+              $(CC) -o ipv6calc $(OBJS) $(GETOBJS) -lipv6calc -L../lib/ -lcrypto $(LDFLAGS)
+-              $(CC) -o ipv6calc $(OBJS) $(GETOBJS) -lipv6calc -L../lib/
++              $(CC) -o ipv6calc $(OBJS) $(GETOBJS) -lipv6calc -L../lib/ $(LDFLAGS)
  
  static:               ipv6calc
-               $(CC) -o ipv6calc-static $(OBJS) $(GETOBJS) -lcrypto -static
+               $(CC) -o ipv6calc-static $(OBJS) $(GETOBJS) -lipv6calc -L../lib/ -static



Home | Main Index | Thread Index | Old Index