# This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # Makefile.diff # files/freebsd9_patch-src-sysctl.c # echo x - Makefile.diff sed 's/^X//' >Makefile.diff << 'ad2ded6500d2f53baa2cfd8297bb8250' X--- Makefile.orig 2011-04-12 12:38:33.000000000 +0400 X+++ Makefile 2011-04-12 12:40:51.000000000 +0400 X@@ -37,5 +37,8 @@ X (${OSVERSION} < 800000 && ${OSVERSION} >= 701103) X EXTRA_PATCHES+= ${FILESDIR}/freebsd8_patch-src-jail.c X .endif X+.if ${OSVERSION} >= 900030 X+EXTRA_PATCHES+= ${FILESDIR}/freebsd9_patch-src-sysctl.c X+.endif X X .include ad2ded6500d2f53baa2cfd8297bb8250 echo x - files/freebsd9_patch-src-sysctl.c sed 's/^X//' >files/freebsd9_patch-src-sysctl.c << 'e5a237c0a16ff35f1db2d78c06794513' X--- src/sysctl.c.orig 2011-04-12 12:30:50.000000000 +0400 X+++ src/sysctl.c 2011-04-12 12:37:45.000000000 +0400 X@@ -121,7 +121,7 @@ const size_t sysctl_type_sizes[CTLTYPE] X 0, /* CTLTYPE_NODE */ X sizeof(int), /* CTLTYPE_INT */ X 0, /* CTLTYPE_STRING */ X- sizeof(quad_t), /* CTLTYPE_QUAD */ X+ sizeof(quad_t), /* CTLTYPE_S64 */ X 0, /* CTLTYPE_OPAQUE */ X sizeof(unsigned int), /* CTLTYPE_UINT */ X sizeof(long), /* CTLTYPE_LONG */ X@@ -329,7 +329,7 @@ PyFB_sysctl(PyObject *self, PyObject *ar X case CTLTYPE_UINT: X case CTLTYPE_LONG: X case CTLTYPE_ULONG: X- case CTLTYPE_QUAD: X+ case CTLTYPE_S64: X if (!PyInt_Check(newobj) && !PyLong_Check(newobj)) { X PyErr_SetString(PyExc_TypeError, X "argument 2 must be integer for this node"); X@@ -350,7 +350,7 @@ PyFB_sysctl(PyObject *self, PyObject *ar X case CTLTYPE_ULONG: X val.m_ulong = PyLong_AsUnsignedLong(newobj); X break; X- case CTLTYPE_QUAD: X+ case CTLTYPE_S64: X val.m_quad = (quad_t)PyLong_AsLongLong(newobj); X break; X } X@@ -439,7 +439,7 @@ PyFB_sysctl(PyObject *self, PyObject *ar X case CTLTYPE_STRING: X ret = PyString_FromStringAndSize(oldp, oldlen - 1); X break; X- case CTLTYPE_QUAD: X+ case CTLTYPE_S64: X assert(oldlen == sizeof(quad_t)); X ret = PyLong_FromLongLong((long long)*(quad_t *)oldp); X break; e5a237c0a16ff35f1db2d78c06794513 exit