Import Debian changes 0.69.0-2

[hcoop/debian/courier-authlib.git] / libs / makedat / makedat.in

diff --git a/libs/makedat/makedat.in b/libs/makedat/makedat.in
index 113838c..53259ab 100644 (file)
--- a/libs/makedat/makedat.in
+++ b/libs/makedat/makedat.in
@@ -83,11 +83,7 @@ get_access() {
        then
                if test "$srcfile" != "CVS"
                then
-                       for f in "$srcfile"/*
-                       do
-                               test -f $f || continue
-                               cat "$f" || return
-                       done
+                       find -L "$srcfile" -maxdepth 1 -type f -not -name "*~" -not -regex ".*\.dpkg-[a-z]*" -exec cat {} \;
                fi
        else
                cat "$srcfile" || return
@@ -115,6 +111,7 @@ docidr() {
                            foreach ( Net::CIDR::cidr2octets(
                                        Net::CIDR::range2cidr($net)))
                            {
+                               print ":" if $net =~ /:/;
                                print "$_\t$line\n";
                            }
                        }