[src/trunk]: src/crypto/external/bsd/netpgp/dist/bindings Re-instate perl tai...

[agc <agc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6a9c7f214d54
branches:  trunk
changeset: 749524:6a9c7f214d54
user:      agc <agc%NetBSD.org@localhost>
date:      Tue Dec 01 20:44:50 2009 +0000

description:
Re-instate perl taint checking by re-defining the possible taint check in
swig. Fix a bug whereby the generated shlib_version file got appended to,
rather than rewritten.

diffstat:

 crypto/external/bsd/netpgp/dist/bindings/perl/Makefile          |   2 +-
 crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl         |   2 +-
 crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl.i      |   2 +
 crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl_wrap.c |   2 +
 crypto/external/bsd/netpgp/dist/bindings/perl/shlib_version     |  20 ----------
 crypto/external/bsd/netpgp/dist/bindings/swig/swigit            |   6 ++-
 crypto/external/bsd/netpgp/dist/bindings/tcl/Makefile           |   2 +-
 crypto/external/bsd/netpgp/dist/bindings/tcl/netpgptcl.i        |   2 +
 crypto/external/bsd/netpgp/dist/bindings/tcl/netpgptcl_wrap.c   |   2 +
 crypto/external/bsd/netpgp/dist/bindings/tcl/shlib_version      |   2 +
 10 files changed, 18 insertions(+), 24 deletions(-)

diffs (138 lines):

diff -r dfecaa10dcef -r 6a9c7f214d54 crypto/external/bsd/netpgp/dist/bindings/perl/Makefile
--- a/crypto/external/bsd/netpgp/dist/bindings/perl/Makefile    Tue Dec 01 18:51:20 2009 +0000
+++ b/crypto/external/bsd/netpgp/dist/bindings/perl/Makefile    Tue Dec 01 20:44:50 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/12/01 06:43:57 agc Exp $
+# $NetBSD: Makefile,v 1.2 2009/12/01 20:44:50 agc Exp $
 # Automatically generated by swigit wrapper script
 
 PREFIX=/usr/pkg
diff -r dfecaa10dcef -r 6a9c7f214d54 crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl
--- a/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl   Tue Dec 01 18:51:20 2009 +0000
+++ b/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl   Tue Dec 01 20:44:50 2009 +0000
@@ -1,4 +1,4 @@
-#! /usr/pkg/bin/perl -w
+#! /usr/pkg/bin/perl -wT
 
 # netpgp bindings for perl
 
diff -r dfecaa10dcef -r 6a9c7f214d54 crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl.i
--- a/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl.i        Tue Dec 01 18:51:20 2009 +0000
+++ b/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl.i        Tue Dec 01 20:44:50 2009 +0000
@@ -1,5 +1,7 @@
 %module netpgpperl
 %{
 #include <netpgp.h>
+#undef SvPOK
+#define SvPOK(x) 1
 %}
 %include netpgp.h
diff -r dfecaa10dcef -r 6a9c7f214d54 crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl_wrap.c
--- a/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl_wrap.c   Tue Dec 01 18:51:20 2009 +0000
+++ b/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl_wrap.c   Tue Dec 01 20:44:50 2009 +0000
@@ -1445,6 +1445,8 @@
 
 
 #include <netpgp.h>
+#undef SvPOK
+#define SvPOK(x) 1
 
 
 #include <limits.h>
diff -r dfecaa10dcef -r 6a9c7f214d54 crypto/external/bsd/netpgp/dist/bindings/perl/shlib_version
--- a/crypto/external/bsd/netpgp/dist/bindings/perl/shlib_version       Tue Dec 01 18:51:20 2009 +0000
+++ b/crypto/external/bsd/netpgp/dist/bindings/perl/shlib_version       Tue Dec 01 20:44:50 2009 +0000
@@ -1,22 +1,2 @@
-major=0
-minor=0
-major=0
-minor=0
-major=0
-minor=0
-major=0
-minor=0
 major=0
 minor=0
-major=0
-minor=0
-major=0
-minor=0
-major=0
-minor=0
-major=0
-minor=0
-major=0
-minor=0
-major=0
-minor=0
diff -r dfecaa10dcef -r 6a9c7f214d54 crypto/external/bsd/netpgp/dist/bindings/swig/swigit
--- a/crypto/external/bsd/netpgp/dist/bindings/swig/swigit      Tue Dec 01 18:51:20 2009 +0000
+++ b/crypto/external/bsd/netpgp/dist/bindings/swig/swigit      Tue Dec 01 20:44:50 2009 +0000
@@ -44,6 +44,8 @@
        ;;
 perl)
        dir=$(pkg_info -qL perl | awk '/EXTERN.h/ { gsub("/EXTERN.h$", ""); print }')
+       cstrings1='#undef SvPOK'
+       cstrings2='#define SvPOK(x) 1'
        incpath='CPPFLAGS+=-I'"$dir"
        ;;
 python)
@@ -64,6 +66,8 @@
 %module ${module}${lang}
 %{
 #include <${module}.h>
+${cstrings1}
+${cstrings2}
 %}
 %include ${module}.h
 EOF
@@ -90,7 +94,7 @@
 .include <bsd.lib.mk>
 EOF
 
-cat << EOF >> shlib_version
+cat << EOF > shlib_version
 major=0
 minor=0
 EOF
diff -r dfecaa10dcef -r 6a9c7f214d54 crypto/external/bsd/netpgp/dist/bindings/tcl/Makefile
--- a/crypto/external/bsd/netpgp/dist/bindings/tcl/Makefile     Tue Dec 01 18:51:20 2009 +0000
+++ b/crypto/external/bsd/netpgp/dist/bindings/tcl/Makefile     Tue Dec 01 20:44:50 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/12/01 06:43:57 agc Exp $
+# $NetBSD: Makefile,v 1.2 2009/12/01 20:44:50 agc Exp $
 # Automatically generated by swigit wrapper script
 
 PREFIX=/usr/pkg
diff -r dfecaa10dcef -r 6a9c7f214d54 crypto/external/bsd/netpgp/dist/bindings/tcl/netpgptcl.i
--- a/crypto/external/bsd/netpgp/dist/bindings/tcl/netpgptcl.i  Tue Dec 01 18:51:20 2009 +0000
+++ b/crypto/external/bsd/netpgp/dist/bindings/tcl/netpgptcl.i  Tue Dec 01 20:44:50 2009 +0000
@@ -1,5 +1,7 @@
 %module netpgptcl
 %{
 #include <netpgp.h>
+
+
 %}
 %include netpgp.h
diff -r dfecaa10dcef -r 6a9c7f214d54 crypto/external/bsd/netpgp/dist/bindings/tcl/netpgptcl_wrap.c
--- a/crypto/external/bsd/netpgp/dist/bindings/tcl/netpgptcl_wrap.c     Tue Dec 01 18:51:20 2009 +0000
+++ b/crypto/external/bsd/netpgp/dist/bindings/tcl/netpgptcl_wrap.c     Tue Dec 01 20:44:50 2009 +0000
@@ -1607,6 +1607,8 @@
 #include <netpgp.h>
 
 
+
+
 #include <limits.h>
 #ifndef LLONG_MIN
 # define LLONG_MIN     LONG_LONG_MIN
diff -r dfecaa10dcef -r 6a9c7f214d54 crypto/external/bsd/netpgp/dist/bindings/tcl/shlib_version
--- a/crypto/external/bsd/netpgp/dist/bindings/tcl/shlib_version        Tue Dec 01 18:51:20 2009 +0000
+++ b/crypto/external/bsd/netpgp/dist/bindings/tcl/shlib_version        Tue Dec 01 20:44:50 2009 +0000
@@ -18,3 +18,5 @@
 minor=0
 major=0
 minor=0
+major=0
+minor=0