diff options
| author | Archie Cobbs <archie@FreeBSD.org> | 2003-11-10 22:31:28 +0000 |
|---|---|---|
| committer | Archie Cobbs <archie@FreeBSD.org> | 2003-11-10 22:31:28 +0000 |
| commit | 7d56a40196ecbf75ad6b28bd8c4b050cea1b17e0 (patch) | |
| tree | 35323f9c617a0e2e3f897b8e310071928cf0c409 /security | |
| parent | add RUN_DEPEND (diff) | |
Fix kernel panic when IPSec also in use. Also fix patch permissions problem.
PR: ports/35631
Submitted by: David Hedley <david@inty.net>
Notes
Notes:
svn path=/head/; revision=93706
Diffstat (limited to 'security')
| -rw-r--r-- | security/skip/files/patch-bs | 9 | ||||
| -rw-r--r-- | security/skip/scripts/pre-patch | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/security/skip/files/patch-bs b/security/skip/files/patch-bs index a1e80e6fdcde..9902f4c50c3f 100644 --- a/security/skip/files/patch-bs +++ b/security/skip/files/patch-bs @@ -245,6 +245,15 @@ diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/freebsd/skip_es.c work. skip_param_t params; skip_hdr_t skip_hdr; skip_es_hash_t *entry, **acl; +@@ -1408,7 +1436,7 @@ + panic("skip_ifinput: mtod returned NULL!"); + } + +- if (!SKIP_IF(ifp)) { ++ if (!ifp || !SKIP_IF(ifp)) { + /* + * SKIP not present on this interface, pass the packet + */ @@ -1718,7 +1747,7 @@ */ decryptbuf->m_data += iphlen; diff --git a/security/skip/scripts/pre-patch b/security/skip/scripts/pre-patch index 9fa1b350181d..87600563f35e 100644 --- a/security/skip/scripts/pre-patch +++ b/security/skip/scripts/pre-patch @@ -4,7 +4,7 @@ # Set user-writable flags so patch(1) doesn't trip up. # -FIXDIRS="${WRKSRC}/skip/man ${WRKSRC}/admin" +FIXDIRS="${WRKSRC}/skip/man ${WRKSRC}/admin ${WRKSRC}/certs/lib ${WRKSRC}/skip/bdcmod/des_ecb" for DIR in ${FIXDIRS}; do chmod -R u+w ${DIR} |