Bug #80

libmchain patch

Added by slynko almost 9 years ago. Updated about 2 years ago.

Status:ClosedStart date:
Priority:NormalDue date:
Assignee:sepherosa% Done:

0%

Category:-
Target version:-

Description

Hi,

all this changes obtained from FreeBSD project
This patch is required for futher smbfs code syncing.

From FreeBSD log:
----------------------------
revision 1.18
date: 2005-07-29 17:22:36 +0400; author: imura; state: Exp; lines:
+10 -6;
Change API of mb_copy_t in libmchain so that netsmb can handle
multibyte character share name correctly.

Reviewed by: bp
----------------------------
revision 1.16
date: 2004-04-06 01:03:35 +0400; author: imp; state: Exp; lines: +0 -3;
branches: 1.16.2;
Remove advertising clause from University of California Regent's license,
per letter dated July 22, 1999.

Approved by: core
----------------------------

revision 1.10
date: 2002-12-16 19:20:06 +0300; author: robert; state: Exp; lines:
+12 -13;
Remove the hto(be|le)[slq] and (be|le)toh[slq] macros defined in
_KERNEL scope from "src/sys/sys/mchain.h".

Replace each occurrence of the above in _KERNEL scope with the
appropriate macro from the set of hto(be|le)(16|32|64) and
(be|le)toh(16|32|64) from "src/sys/sys/endian.h".

Tested by: tjr
Requested by: comment marked with XXX
----------------------------
revision 1.9
date: 2002-10-22 22:44:59 +0400; author: jhb; state: Exp; lines: +12 -6;
Don't dereference the 'x' pointer if it is NULL, instead skip the
assignment. The netsmb code likes to call these functions with a NULL
x argument a lot.

Reported by: Vallo Kallaste <>
----------------------------
revision 1.8
date: 2002-10-11 18:58:30 +0400; author: mike; state: Exp; lines: +4 -2;
Change iov_base's type from `char *' to the standard `void *'. All
uses of iov_base which assume its type is `char *' (in order to do
pointer arithmetic) have been updated to cast iov_base to `char *'.
----------------------------
revision 1.6
date: 2002-07-15 17:15:31 +0400; author: markm; state: Exp; lines: +4 -4;
Convert GNU-styled variadic macros to ISO(9x) style.

P.S. And in FreeBSD m_fixhdr() moved from mbchain to mbuf. Does we need it?

libmchain.diff Magnifier (6.99 KB) slynko, 01/21/2006 11:53 AM

History

#1 Updated by alexh over 5 years ago

I'm cleaning up old bugs.
Did this get commited? Is it of interest?

#2 Updated by sepherosa over 5 years ago

grab

#3 Updated by marino about 2 years ago

  • Description updated (diff)
  • Assignee set to sepherosa

Sephe, does libmchain still need patching?

#4 Updated by sepherosa about 2 years ago

On Thu, Nov 15, 2012 at 10:30 PM, John Marino via Redmine
<> wrote:
>
> Issue #80 has been updated by John Marino.
>
> Description updated
> Assignee set to Sepherosa Ziehau
>
> Sephe, does libmchain still need patching?

Patch committed:
5e8a14a38da718561403517e00d2ab76880c681f

> ----------------------------------------
> Bug #80: libmchain patch
> http://bugs.dragonflybsd.org/issues/80
>
> Author: Alexey Slynko
> Status: New
> Priority: Low
> Assignee: Sepherosa Ziehau
> Category:
> Target version:
>
>
> Hi,
>
> all this changes obtained from FreeBSD project
> This patch is required for futher smbfs code syncing.
>
> From FreeBSD log:
> ----------------------------
> revision 1.18
> date: 2005-07-29 17:22:36 +0400; author: imura; state: Exp; lines:
> +10 -6;
> Change API of mb_copy_t in libmchain so that netsmb can handle
> multibyte character share name correctly.
>
> Reviewed by: bp
> ----------------------------
> revision 1.16
> date: 2004-04-06 01:03:35 +0400; author: imp; state: Exp; lines: +0 -3;
> branches: 1.16.2;
> Remove advertising clause from University of California Regent's license,
> per letter dated July 22, 1999.
>
> Approved by: core
> ----------------------------
>
> revision 1.10
> date: 2002-12-16 19:20:06 +0300; author: robert; state: Exp; lines:
> +12 -13;
> Remove the hto(be|le)[slq] and (be|le)toh[slq] macros defined in
> _KERNEL scope from "src/sys/sys/mchain.h".
>
> Replace each occurrence of the above in _KERNEL scope with the
> appropriate macro from the set of hto(be|le)(16|32|64) and
> (be|le)toh(16|32|64) from "src/sys/sys/endian.h".
>
> Tested by: tjr
> Requested by: comment marked with XXX
> ----------------------------
> revision 1.9
> date: 2002-10-22 22:44:59 +0400; author: jhb; state: Exp; lines: +12 -6;
> Don't dereference the 'x' pointer if it is NULL, instead skip the
> assignment. The netsmb code likes to call these functions with a NULL
> x argument a lot.
>
> Reported by: Vallo Kallaste <>
> ----------------------------
> revision 1.8
> date: 2002-10-11 18:58:30 +0400; author: mike; state: Exp; lines: +4 -2;
> Change iov_base's type from `char *' to the standard `void *'. All
> uses of iov_base which assume its type is `char *' (in order to do
> pointer arithmetic) have been updated to cast iov_base to `char *'.
> ----------------------------
> revision 1.6
> date: 2002-07-15 17:15:31 +0400; author: markm; state: Exp; lines: +4 -4;
> Convert GNU-styled variadic macros to ISO(9x) style.
>
> P.S. And in FreeBSD m_fixhdr() moved from mbchain to mbuf. Does we need it?
>
>
> --
> You have received this notification because you have either subscribed to it, or are involved in it.
> To change your notification preferences, please click here: http://bugs.dragonflybsd.org/my/account

--
Tomorrow Will Never Die

#5 Updated by marino about 2 years ago

  • Status changed from New to Closed

#6 Updated by marino about 2 years ago

  • Priority changed from Low to Immediate

I think this commit just broke world.
I get the following undefined errors:
betohs
letohl
letohq
betohq
betohl
letohs
htoles
htoleq
htobeq

when trying to build mount_smbfs
specifically libsmb complains

(I can't reopen ticket!)

#7 Updated by tuxillo about 2 years ago

  • Status changed from Closed to In Progress

Buildworld apparently broken.

--- mount_smbfs ---
cc -O -pipe -DSMBFS -I/usr/local/poudriere/jails/master-1/usr/src/sbin/mount_smbfs/../../contrib/ smbfs/include -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-pointer-sign -Wextra -Wno-unused-pa rameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wold-style-definition -Wreturn-t ype -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter -Wchar-subscript s -Winline -Wnested-externs -Wredundant-decls -o mount_smbfs mount_smbfs.o getmntopts.o -lsmb
/usr/obj/poudriere/usr/local/poudriere/jails/master-1/usr/src/world_x86_64/usr/lib/libsmb.so: unde fined reference to `betohs'
/usr/obj/poudriere/usr/local/poudriere/jails/master-1/usr/src/world_x86_64/usr/lib/libsmb.so: unde fined reference to `letohl'
/usr/obj/poudriere/usr/local/poudriere/jails/master-1/usr/src/world_x86_64/usr/lib/libsmb.so: unde fined reference to `letohq'
/usr/obj/poudriere/usr/local/poudriere/jails/master-1/usr/src/world_x86_64/usr/lib/libsmb.so: unde fined reference to `betohq'
/usr/obj/poudriere/usr/local/poudriere/jails/master-1/usr/src/world_x86_64/usr/lib/libsmb.so: unde fined reference to `betohl'
/usr/obj/poudriere/usr/local/poudriere/jails/master-1/usr/src/world_x86_64/usr/lib/libsmb.so: unde fined reference to `letohs'
/usr/obj/poudriere/usr/local/poudriere/jails/master-1/usr/src/world_x86_64/usr/lib/libsmb.so: unde fined reference to `htoles'
/usr/obj/poudriere/usr/local/poudriere/jails/master-1/usr/src/world_x86_64/usr/lib/libsmb.so: unde fined reference to `htoleq'
/usr/obj/poudriere/usr/local/poudriere/jails/master-1/usr/src/world_x86_64/usr/lib/libsmb.so: unde fined reference to `htobeq'
*** [mount_smbfs] Error code 1

make: stopped in /usr/local/poudriere/jails/master-1/usr/src/sbin/mount_smbfs

#8 Updated by marino about 2 years ago

  • Status changed from In Progress to Closed
  • Priority changed from Immediate to Normal

Also available in: Atom PDF