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
cvs diff -r1.1 -r1.2 src/crypto/external/bsd/netpgp/dist/bindings/perl/Makefile (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1 2009/12/01 06:43:57 agc Exp $ 1# $NetBSD: Makefile,v 1.2 2009/12/01 20:44:50 agc Exp $
2# Automatically generated by swigit wrapper script 2# Automatically generated by swigit wrapper script
3 3
4PREFIX=/usr/pkg 4PREFIX=/usr/pkg
5 5
6LIB=netpgpperl 6LIB=netpgpperl
7SRCS=netpgpperl_wrap.c 7SRCS=netpgpperl_wrap.c
8WARNS=0 8WARNS=0
9MKMAN=no 9MKMAN=no
10CPPFLAGS+=-I${PREFIX}/include 10CPPFLAGS+=-I${PREFIX}/include
11CPPFLAGS+=-I/usr/pkg/lib/perl5/5.10.0/i386-netbsd-thread-multi/CORE 11CPPFLAGS+=-I/usr/pkg/lib/perl5/5.10.0/i386-netbsd-thread-multi/CORE
12LDFLAGS+=-L${PREFIX}/lib 12LDFLAGS+=-L${PREFIX}/lib
13LDADD+=-lnetpgp 13LDADD+=-lnetpgp
14 14
cvs diff -r1.1 -r1.2 src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl.i (expand / switch to unified diff)

--- 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 @@ @@ -1,5 +1,7 @@
1%module netpgpperl 1%module netpgpperl
2%{ 2%{
3#include <netpgp.h> 3#include <netpgp.h>
 4#undef SvPOK
 5#define SvPOK(x) 1
4%} 6%}
5%include netpgp.h 7%include netpgp.h
cvs diff -r1.1 -r1.2 src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgpperl_wrap.c (expand / switch to unified diff)

--- 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
@@ -1435,26 +1435,28 @@ extern "C" @@ -1435,26 +1435,28 @@ extern "C"
1435#endif 1435#endif
1436#ifndef PERL_OBJECT 1436#ifndef PERL_OBJECT
1437#ifndef MULTIPLICITY 1437#ifndef MULTIPLICITY
1438SWIGEXPORT void SWIG_init (CV* cv); 1438SWIGEXPORT void SWIG_init (CV* cv);
1439#else 1439#else
1440SWIGEXPORT void SWIG_init (pTHXo_ CV* cv); 1440SWIGEXPORT void SWIG_init (pTHXo_ CV* cv);
1441#endif 1441#endif
1442#else 1442#else
1443SWIGEXPORT void SWIG_init (CV *cv, CPerlObj *); 1443SWIGEXPORT void SWIG_init (CV *cv, CPerlObj *);
1444#endif 1444#endif
1445 1445
1446 1446
1447#include <netpgp.h> 1447#include <netpgp.h>
 1448#undef SvPOK
 1449#define SvPOK(x) 1
1448 1450
1449 1451
1450#include <limits.h> 1452#include <limits.h>
1451#ifndef LLONG_MIN 1453#ifndef LLONG_MIN
1452# define LLONG_MIN LONG_LONG_MIN 1454# define LLONG_MIN LONG_LONG_MIN
1453#endif 1455#endif
1454#ifndef LLONG_MAX 1456#ifndef LLONG_MAX
1455# define LLONG_MAX LONG_LONG_MAX 1457# define LLONG_MAX LONG_LONG_MAX
1456#endif 1458#endif
1457#ifndef ULLONG_MAX 1459#ifndef ULLONG_MAX
1458# define ULLONG_MAX ULONG_LONG_MAX 1460# define ULLONG_MAX ULONG_LONG_MAX
1459#endif 1461#endif
1460 1462
cvs diff -r1.1 -r1.2 src/crypto/external/bsd/netpgp/dist/bindings/perl/shlib_version (expand / switch to unified diff)

--- 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 @@ @@ -1,22 +1,2 @@
1major=0 1major=0
2minor=0 2minor=0
3major=0 
4minor=0 
5major=0 
6minor=0 
7major=0 
8minor=0 
9major=0 
10minor=0 
11major=0 
12minor=0 
13major=0 
14minor=0 
15major=0 
16minor=0 
17major=0 
18minor=0 
19major=0 
20minor=0 
21major=0 
22minor=0 
cvs diff -r1.2 -r1.3 src/crypto/external/bsd/netpgp/dist/bindings/perl/netpgp.pl (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1#! /usr/pkg/bin/perl -w 1#! /usr/pkg/bin/perl -wT
2 2
3# netpgp bindings for perl 3# netpgp bindings for perl
4 4
5use lib "/usr/src/crypto/external/bsd/netpgp-bindings/dist/bindings/perl"; 5use lib "/usr/src/crypto/external/bsd/netpgp-bindings/dist/bindings/perl";
6 6
7use netpgpperl; 7use netpgpperl;
8 8
9# initializations 9# initializations
10$n = netpgpperlc::new_netpgp_t(); 10$n = netpgpperlc::new_netpgp_t();
11netpgpperlc::netpgp_setvar($n, "homedir", $ENV{'HOME'}."/.gnupg"); 11netpgpperlc::netpgp_setvar($n, "homedir", $ENV{'HOME'}."/.gnupg");
12netpgpperlc::netpgp_setvar($n, "hash", "SHA256"); 12netpgpperlc::netpgp_setvar($n, "hash", "SHA256");
13netpgpperlc::netpgp_init($n); 13netpgpperlc::netpgp_init($n);
14 14
cvs diff -r1.2 -r1.3 src/crypto/external/bsd/netpgp/dist/bindings/swig/swigit (expand / switch to unified diff)

--- 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
@@ -34,65 +34,69 @@ @@ -34,65 +34,69 @@
34 34
35prefix=$(pkg_info -qp swig | awk '{ print $2 }') 35prefix=$(pkg_info -qp swig | awk '{ print $2 }')
36 36
37lang=$1 37lang=$1
38module=$2 38module=$2
39 39
40case "$lang" in 40case "$lang" in
41"") 41"")
42 echo "You need to specify an interpreted language like perl or tcl" 42 echo "You need to specify an interpreted language like perl or tcl"
43 exit 1 43 exit 1
44 ;; 44 ;;
45perl) 45perl)
46 dir=$(pkg_info -qL perl | awk '/EXTERN.h/ { gsub("/EXTERN.h$", ""); print }') 46 dir=$(pkg_info -qL perl | awk '/EXTERN.h/ { gsub("/EXTERN.h$", ""); print }')
 47 cstrings1='#undef SvPOK'
 48 cstrings2='#define SvPOK(x) 1'
47 incpath='CPPFLAGS+=-I'"$dir" 49 incpath='CPPFLAGS+=-I'"$dir"
48 ;; 50 ;;
49python) 51python)
50 swigflags="-classic" 52 swigflags="-classic"
51 dir=$(pkg_info -qL 'python*' | awk '/Python.h/ { gsub("/Python.h$", ""); print }') 53 dir=$(pkg_info -qL 'python*' | awk '/Python.h/ { gsub("/Python.h$", ""); print }')
52 incpath='CPPFLAGS+=-I'"$dir" 54 incpath='CPPFLAGS+=-I'"$dir"
53 ;; 55 ;;
54esac 56esac
55 57
56case "$module" in 58case "$module" in
57"") 59"")
58 echo "You need to specify a module" 60 echo "You need to specify a module"
59 exit 1 61 exit 1
60 ;; 62 ;;
61esac 63esac
62 64
63cat << EOF > ${module}${lang}.i 65cat << EOF > ${module}${lang}.i
64%module ${module}${lang} 66%module ${module}${lang}
65%{ 67%{
66#include <${module}.h> 68#include <${module}.h>
 69${cstrings1}
 70${cstrings2}
67%} 71%}
68%include ${module}.h 72%include ${module}.h
69EOF 73EOF
70 74
71cp ../../include/${module}.h . 75cp ../../include/${module}.h .
72 76
73swig ${swigflags} -${lang} ${module}${lang}.i 77swig ${swigflags} -${lang} ${module}${lang}.i
74 78
75cat << EOF > Makefile 79cat << EOF > Makefile
76# \$NetBSD\$ 80# \$NetBSD\$
77# Automatically generated by swigit wrapper script 81# Automatically generated by swigit wrapper script
78 82
79PREFIX=${prefix} 83PREFIX=${prefix}
80 84
81LIB=${module}${lang} 85LIB=${module}${lang}
82SRCS=${module}${lang}_wrap.c 86SRCS=${module}${lang}_wrap.c
83WARNS=0 87WARNS=0
84MKMAN=no 88MKMAN=no
85CPPFLAGS+=-I\${PREFIX}/include 89CPPFLAGS+=-I\${PREFIX}/include
86${incpath} 90${incpath}
87LDFLAGS+=-L\${PREFIX}/lib 91LDFLAGS+=-L\${PREFIX}/lib
88LDADD+=-l${module} 92LDADD+=-l${module}
89 93
90.include <bsd.lib.mk> 94.include <bsd.lib.mk>
91EOF 95EOF
92 96
93cat << EOF >> shlib_version 97cat << EOF > shlib_version
94major=0 98major=0
95minor=0 99minor=0
96EOF 100EOF
97 101
98env USETOOLS=no make 102env USETOOLS=no make
cvs diff -r1.1 -r1.2 src/crypto/external/bsd/netpgp/dist/bindings/tcl/Makefile (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1 2009/12/01 06:43:57 agc Exp $ 1# $NetBSD: Makefile,v 1.2 2009/12/01 20:44:50 agc Exp $
2# Automatically generated by swigit wrapper script 2# Automatically generated by swigit wrapper script
3 3
4PREFIX=/usr/pkg 4PREFIX=/usr/pkg
5 5
6LIB=netpgptcl 6LIB=netpgptcl
7SRCS=netpgptcl_wrap.c 7SRCS=netpgptcl_wrap.c
8WARNS=0 8WARNS=0
9MKMAN=no 9MKMAN=no
10CPPFLAGS+=-I${PREFIX}/include 10CPPFLAGS+=-I${PREFIX}/include
11 11
12LDFLAGS+=-L${PREFIX}/lib 12LDFLAGS+=-L${PREFIX}/lib
13LDADD+=-lnetpgp 13LDADD+=-lnetpgp
14 14
cvs diff -r1.1 -r1.2 src/crypto/external/bsd/netpgp/dist/bindings/tcl/netpgptcl.i (expand / switch to unified diff)

--- 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 @@ @@ -1,5 +1,7 @@
1%module netpgptcl 1%module netpgptcl
2%{ 2%{
3#include <netpgp.h> 3#include <netpgp.h>
 4
 5
4%} 6%}
5%include netpgp.h 7%include netpgp.h
cvs diff -r1.1 -r1.2 src/crypto/external/bsd/netpgp/dist/bindings/tcl/netpgptcl_wrap.c (expand / switch to unified diff)

--- 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
@@ -1597,26 +1597,28 @@ extern "C" { @@ -1597,26 +1597,28 @@ extern "C" {
1597SWIGEXPORT int SWIG_init(Tcl_Interp *); 1597SWIGEXPORT int SWIG_init(Tcl_Interp *);
1598#ifdef MAC_TCL 1598#ifdef MAC_TCL
1599#pragma export off 1599#pragma export off
1600#endif 1600#endif
1601#ifdef __cplusplus 1601#ifdef __cplusplus
1602} 1602}
1603#endif 1603#endif
1604 1604
1605 1605
1606 1606
1607#include <netpgp.h> 1607#include <netpgp.h>
1608 1608
1609 1609
 1610
 1611
1610#include <limits.h> 1612#include <limits.h>
1611#ifndef LLONG_MIN 1613#ifndef LLONG_MIN
1612# define LLONG_MIN LONG_LONG_MIN 1614# define LLONG_MIN LONG_LONG_MIN
1613#endif 1615#endif
1614#ifndef LLONG_MAX 1616#ifndef LLONG_MAX
1615# define LLONG_MAX LONG_LONG_MAX 1617# define LLONG_MAX LONG_LONG_MAX
1616#endif 1618#endif
1617#ifndef ULLONG_MAX 1619#ifndef ULLONG_MAX
1618# define ULLONG_MAX ULONG_LONG_MAX 1620# define ULLONG_MAX ULONG_LONG_MAX
1619#endif 1621#endif
1620 1622
1621 1623
1622SWIGINTERN int 1624SWIGINTERN int
cvs diff -r1.1 -r1.2 src/crypto/external/bsd/netpgp/dist/bindings/tcl/shlib_version (expand / switch to unified diff)

--- 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
@@ -8,13 +8,15 @@ major=0 @@ -8,13 +8,15 @@ major=0
8minor=0 8minor=0
9major=0 9major=0
10minor=0 10minor=0
11major=0 11major=0
12minor=0 12minor=0
13major=0 13major=0
14minor=0 14minor=0
15major=0 15major=0
16minor=0 16minor=0
17major=0 17major=0
18minor=0 18minor=0
19major=0 19major=0
20minor=0 20minor=0
 21major=0
 22minor=0