Re: [squid-users] Fwd: squid-3.2.0.6 - make issue on OpenBSD 4.8 - 64 bit

>> patch -p0<  /PATH/TO/bug3185_mk2.patch
>
> Exactly correct.
>
> Being in the base folder of your squid sources when running it
> (/root/software/squid-3.2.0.6/)

DONE. performed below steps.

first,

did cd to /root/software/squid-3.2.0.6/compat/os

backed up as follows.

cp openbsd.h openbsd.h.orig

then,

did cd to /root/software/squid-3.2.0.6

patch -p0 < /tmp/bug3185_mk2.patch

Pls see the output.

Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|=== modified file 'compat/os/openbsd.h'
|--- compat/os/openbsd.h 2010-11-21 04:40:05 +0000
|+++ compat/os/openbsd.h 2011-04-08 08:10:12 +0000
--------------------------
Patching file compat/os/openbsd.h using Plan A...
Hunk #1 succeeded at 30.
Hmm... Ignoring the trailing garbage.
done

It worked didn't it? I think yes. your comments are welcome...

then,

# cd /root/software/squid-3.2.0.6/compat/os

# diff openbsd.h openbsd.h.orig

33,40d32
< /* OpenBSD requires netinet/in.h before arpa/inet.h */
< #if HAVE_NETINET_IN_H
< #include <netinet/in.h>
< #endif
< #if HAVE_ARPA_INET_H
< #include <arpa/inet.h>
< #endif
<

anyway , now the full contents of openbsd.h is as follows.

# cat openbsd.h

#ifndef SQUID_OS_OPENBSD_H
#define SQUID_OS_OPENBSD_H

#ifdef _SQUID_OPENBSD_

/****************************************************************************
 *--------------------------------------------------------------------------*
 * DO *NOT* MAKE ANY CHANGES below here unless you know what you're doing...*
 *--------------------------------------------------------------------------*
 ****************************************************************************/

/*
 * Don't allow inclusion of malloc.h
 */
#if HAVE_MALLOC_H
#undef HAVE_MALLOC_H
#endif

/*
 * This OS has at least one version that defines these as private
 * kernel macros commented as being 'non-standard'.
 * We need to use them, much nicer than the OS-provided __u*_*[]
 */
//#define s6_addr8 __u6_addr.__u6_addr8
//#define s6_addr16 __u6_addr.__u6_addr16
#define s6_addr32 __u6_addr.__u6_addr32

/* OpenBSD also hide v6only socket option we need for comm layer. :-( */
#if !defined(IPV6_V6ONLY)
#define IPV6_V6ONLY 27 // from OpenBSD 4.3 headers. (NP:
does not match non-BSD OS values)
#endif

/* OpenBSD requires netinet/in.h before arpa/inet.h */
#if HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
#if HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif

#endif /* _SQUID_OPENBSD_ */
#endif /* SQUID_OS_OPENBSD_H */

That's all for that patch. I think U r ok.

anyway. for the /dev/pf thing, I will come back with an update....

-- 
Thank you
Indunil Jayasooriya