[asterisk-dev] dahdi 2.6.1+2.6.1 compile fails

[Eric Smith]

I am trying to compile a dahdi module from checkout:
svn co http://svn.asterisk.org/svn/dahdi/linux-complete/tags/2.6.1+2.6.1
with ubuntu 3.5.0-17-generic and gcc 4.7.2

Error on compile is:
oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c:3870:47:\ 
 error: 'NULL' undeclared (first use in this function)

This is identical to the error reported in this patch fix:
https://issues.asterisk.org/jira/browse/DAHTOOL-60?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel

How would I apply this patch?

[eric at pepper ~/src/asterisk-complete/asterisk/dahdi/2.6.1+2.6.1] $ patch <DAHTOOL-60-f17.diff
can't find file to patch at input line 5
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/xpp/oct612x/include/octdef.h b/xpp/oct612x/include/octdef.h
|index a2da33d..7e534b7 100644
|--- a/xpp/oct612x/include/octdef.h
|+++ b/xpp/oct612x/include/octdef.h
--------------------------
File to patch:


-- 
Eric Smith