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.
This commit is contained in:
agc 2009-12-01 20:44:50 +00:00
parent 9e0d6893b8
commit e5e6e15318
10 changed files with 18 additions and 24 deletions

View File

@ -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 # Automatically generated by swigit wrapper script
PREFIX=/usr/pkg PREFIX=/usr/pkg

View File

@ -1,4 +1,4 @@
#! /usr/pkg/bin/perl -w #! /usr/pkg/bin/perl -wT
# netpgp bindings for perl # netpgp bindings for perl

View File

@ -1,5 +1,7 @@
%module netpgpperl %module netpgpperl
%{ %{
#include <netpgp.h> #include <netpgp.h>
#undef SvPOK
#define SvPOK(x) 1
%} %}
%include netpgp.h %include netpgp.h

View File

@ -1445,6 +1445,8 @@ SWIGEXPORT void SWIG_init (CV *cv, CPerlObj *);
#include <netpgp.h> #include <netpgp.h>
#undef SvPOK
#define SvPOK(x) 1
#include <limits.h> #include <limits.h>

View File

@ -1,22 +1,2 @@
major=0 major=0
minor=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

View File

@ -44,6 +44,8 @@ case "$lang" in
;; ;;
perl) perl)
dir=$(pkg_info -qL perl | awk '/EXTERN.h/ { gsub("/EXTERN.h$", ""); print }') dir=$(pkg_info -qL perl | awk '/EXTERN.h/ { gsub("/EXTERN.h$", ""); print }')
cstrings1='#undef SvPOK'
cstrings2='#define SvPOK(x) 1'
incpath='CPPFLAGS+=-I'"$dir" incpath='CPPFLAGS+=-I'"$dir"
;; ;;
python) python)
@ -64,6 +66,8 @@ cat << EOF > ${module}${lang}.i
%module ${module}${lang} %module ${module}${lang}
%{ %{
#include <${module}.h> #include <${module}.h>
${cstrings1}
${cstrings2}
%} %}
%include ${module}.h %include ${module}.h
EOF EOF
@ -90,7 +94,7 @@ LDADD+=-l${module}
.include <bsd.lib.mk> .include <bsd.lib.mk>
EOF EOF
cat << EOF >> shlib_version cat << EOF > shlib_version
major=0 major=0
minor=0 minor=0
EOF EOF

View File

@ -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 # Automatically generated by swigit wrapper script
PREFIX=/usr/pkg PREFIX=/usr/pkg

View File

@ -1,5 +1,7 @@
%module netpgptcl %module netpgptcl
%{ %{
#include <netpgp.h> #include <netpgp.h>
%} %}
%include netpgp.h %include netpgp.h

View File

@ -1607,6 +1607,8 @@ SWIGEXPORT int SWIG_init(Tcl_Interp *);
#include <netpgp.h> #include <netpgp.h>
#include <limits.h> #include <limits.h>
#ifndef LLONG_MIN #ifndef LLONG_MIN
# define LLONG_MIN LONG_LONG_MIN # define LLONG_MIN LONG_LONG_MIN

View File

@ -18,3 +18,5 @@ major=0
minor=0 minor=0
major=0 major=0
minor=0 minor=0
major=0
minor=0