Tue Dec 1 20:44:50 2009 UTC ()
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.
(agc)
diff -r1.1 -r1.2 src/crypto/external/bsd/netpgp/dist/bindings/perl/Makefile
diff -r1.1 -r1.2 src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl.i
diff -r1.1 -r1.2 src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl_wrap.c
diff -r1.1 -r1.2 src/crypto/external/bsd/netpgp/dist/bindings/perl/shlib_version
diff -r1.2 -r1.3 src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl
diff -r1.2 -r1.3 src/crypto/external/bsd/netpgp/dist/bindings/swig/swigit
diff -r1.1 -r1.2 src/crypto/external/bsd/netpgp/dist/bindings/tcl/Makefile
diff -r1.1 -r1.2 src/crypto/external/bsd/netpgp/dist/bindings/tcl/netpgptcl.i
diff -r1.1 -r1.2 src/crypto/external/bsd/netpgp/dist/bindings/tcl/netpgptcl_wrap.c
diff -r1.1 -r1.2 src/crypto/external/bsd/netpgp/dist/bindings/tcl/shlib_version
--- src/crypto/external/bsd/netpgp/dist/bindings/perl/Makefile 2009/12/01 06:43:57 1.1
+++ src/crypto/external/bsd/netpgp/dist/bindings/perl/Makefile 2009/12/01 20:44:50 1.2
@@ -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
--- src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl.i 2009/12/01 06:43:57 1.1
+++ src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl.i 2009/12/01 20:44:50 1.2
@@ -1,5 +1,7 @@
%module netpgpperl
%{
#include <netpgp.h>
+#undef SvPOK
+#define SvPOK(x) 1
%}
%include netpgp.h
--- src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl_wrap.c 2009/12/01 06:43:57 1.1
+++ src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl_wrap.c 2009/12/01 20:44:50 1.2
@@ -1445,6 +1445,8 @@
#include <netpgp.h>
+#undef SvPOK
+#define SvPOK(x) 1
#include <limits.h>
--- src/crypto/external/bsd/netpgp/dist/bindings/perl/shlib_version 2009/12/01 06:43:57 1.1
+++ src/crypto/external/bsd/netpgp/dist/bindings/perl/shlib_version 2009/12/01 20:44:50 1.2
@@ -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
--- src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl 2009/12/01 08:02:50 1.2
+++ src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl 2009/12/01 20:44:50 1.3
@@ -1,4 +1,4 @@
-#! /usr/pkg/bin/perl -w
+#! /usr/pkg/bin/perl -wT
# netpgp bindings for perl
--- src/crypto/external/bsd/netpgp/dist/bindings/swig/swigit 2009/12/01 06:33:31 1.2
+++ src/crypto/external/bsd/netpgp/dist/bindings/swig/swigit 2009/12/01 20:44:50 1.3
@@ -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
--- src/crypto/external/bsd/netpgp/dist/bindings/tcl/Makefile 2009/12/01 06:43:57 1.1
+++ src/crypto/external/bsd/netpgp/dist/bindings/tcl/Makefile 2009/12/01 20:44:50 1.2
@@ -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
--- src/crypto/external/bsd/netpgp/dist/bindings/tcl/netpgptcl.i 2009/12/01 06:43:57 1.1
+++ src/crypto/external/bsd/netpgp/dist/bindings/tcl/netpgptcl.i 2009/12/01 20:44:50 1.2
@@ -1,5 +1,7 @@
%module netpgptcl
%{
#include <netpgp.h>
+
+
%}
%include netpgp.h
--- src/crypto/external/bsd/netpgp/dist/bindings/tcl/netpgptcl_wrap.c 2009/12/01 06:43:58 1.1
+++ src/crypto/external/bsd/netpgp/dist/bindings/tcl/netpgptcl_wrap.c 2009/12/01 20:44:50 1.2
@@ -1607,6 +1607,8 @@
#include <netpgp.h>
+
+
#include <limits.h>
#ifndef LLONG_MIN
# define LLONG_MIN LONG_LONG_MIN
--- src/crypto/external/bsd/netpgp/dist/bindings/tcl/shlib_version 2009/12/01 06:43:58 1.1
+++ src/crypto/external/bsd/netpgp/dist/bindings/tcl/shlib_version 2009/12/01 20:44:50 1.2
@@ -18,3 +18,5 @@
minor=0
major=0
minor=0
+major=0
+minor=0