From odip@bionet.nsc.ru  Thu Jun 30 15:59:02 2005
Return-Path: <odip@bionet.nsc.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 371B216A41C;
	Thu, 30 Jun 2005 15:59:02 +0000 (GMT)
	(envelope-from odip@bionet.nsc.ru)
Received: from hydra.bionet.nsc.ru (hydra.bionet.nsc.ru [84.237.118.162])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0C19D43D48;
	Thu, 30 Jun 2005 15:59:00 +0000 (GMT)
	(envelope-from odip@bionet.nsc.ru)
Received: by hydra.bionet.nsc.ru (Postfix, from userid 1001)
	id 0C385553C; Thu, 30 Jun 2005 22:58:58 +0700 (NOVST)
Message-Id: <20050630155858.0C385553C@hydra.bionet.nsc.ru>
Date: Thu, 30 Jun 2005 22:58:58 +0700 (NOVST)
From: Dmitry A Grigorovich <odip@bionet.nsc.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: flz@FreeBSD.org
Subject: [patch] smbldap-tools 0.9.1 + many FreeBSD patches
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         82830
>Category:       ports
>Synopsis:       [patch] smbldap-tools 0.9.1 + many FreeBSD patches
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    flz
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 30 16:00:37 GMT 2005
>Closed-Date:    Sun Jul 31 16:59:27 GMT 2005
>Last-Modified:  Wed Aug  3 16:40:09 GMT 2005
>Originator:     Dmitry A Grigorovich
>Release:        FreeBSD 5.4-RELEASE-p2
>Organization:
ICiG SB RAS, Russia
>Environment:
FreeBSD manticore.bionet.nsc.ru 5.4-RELEASE-p2

>Description:

There are new version of smbldap-tools 0.9.1
While testing it on my LDAP server I wrote many patches for it

>How-To-Repeat:

N/A

>Fix:

Patch /usr/ports/net/smbldap-tools
Also place files.tar.bz2 into files subdir
Rebuild and reinstall port

--- patch-tools begins here ---
diff -ur smbldap-tools/Makefile smbldap-tools.new/Makefile
--- smbldap-tools/Makefile	Wed Mar  2 04:56:20 2005
+++ smbldap-tools.new/Makefile	Thu Jun  9 22:18:54 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smbldap-tools
-PORTVERSION=	0.8.7
+PORTVERSION=	0.9.1
 CATEGORIES=	net
 MASTER_SITES=	http://samba.idealx.org/dist/
 EXTRACT_SUFX=	.tgz
@@ -20,32 +20,49 @@
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PERL5=	yes
+USE_REINPLACE=	yes
 NO_BUILD=	yes
 
+CONF_DIR=	${PREFIX}/etc/${PORTNAME}
+DOC_HTML_LIST = \
+	contents_motif.gif index.html next_motif.gif previous_motif.gif smbldap-tools.html \
+	smbldap-tools001.html smbldap-tools002.html smbldap-tools003.html smbldap-tools004.html \
+	smbldap-tools005.html smbldap-tools006.html smbldap-tools007.html smbldap-tools008.html \
+	smbldap-tools009.html smbldap-tools010.html
+SED_ARGS=	-e s'|%%PREFIX%%|${PREFIX}|g'
+
 post-patch:
-	@${PERL} -pi -e 's#/etc/samba#${PREFIX}/etc/samba#' ${WRKSRC}/configure.pl \
-								${WRKSRC}/smb.conf
-	@${PERL} -pi -e 's#/etc/smb#${PREFIX}/etc/smb#' ${WRKSRC}/configure.pl \
-							${WRKSRC}/smbldap.conf \
-							${WRKSRC}/smbldap_tools.pm
-	@${PERL} -pi -e 's#/etc/opt/IDEALX#${PREFIX}/etc#' ${WRKSRC}/smbldap_tools.pm
-	@${PERL} -pi -e 's#/usr/sbin#${LOCALBASE}/sbin#' ${WRKSRC}/smbldap-passwd
+.for i in configure.pl smb.conf smbldap.conf smbldap_tools.pm smbldap-populate \
+	doc/smbldap-migrate-pwdump-accounts doc/smbldap-migrate-pwdump-groups
+	@${REINPLACE_CMD} ${SED_ARGS} ${WRKSRC}/$i
+.endfor
 
 do-install:
-	${MKDIR} ${PREFIX}/etc/${PORTNAME}
-	${MKDIR} ${EXAMPLESDIR}/etc
-.for i in smbldap.conf smbldap_bind.conf
-	${INSTALL_DATA} ${WRKSRC}/$i ${EXAMPLESDIR}/etc/$i
-	@[ -f ${PREFIX}/etc/${PORTNAME}/$i ] || ${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/etc/${PORTNAME}/$i
-.endfor
+	${MKDIR} ${CONF_DIR}
+	${MKDIR} ${EXAMPLESDIR}
+
 .for i in smbldap-groupadd smbldap-groupdel smbldap-groupmod smbldap-groupshow smbldap-useradd smbldap-userdel smbldap-usermod smbldap-usershow smbldap-passwd smbldap-populate
 	${INSTALL_SCRIPT} ${WRKSRC}/$i ${PREFIX}/sbin
 .endfor
-.for i in smbldap-migrate-accounts smbldap-migrate-groups smbldap-migrate-unix-accounts smbldap-migrate-unix-groups
+.for i in smbldap-migrate-pwdump-accounts smbldap-migrate-pwdump-groups smbldap-migrate-unix-accounts smbldap-migrate-unix-groups
 	${INSTALL_SCRIPT} ${WRKSRC}/doc/$i ${PREFIX}/sbin
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/smbldap_tools.pm ${SITE_PERL}/
+
+	${INSTALL_DATA} -m 644 ${WRKSRC}/smbldap.conf ${CONF_DIR}/smbldap.conf-dist
+	[ -f ${CONF_DIR}/smbldap.conf ] || ${INSTALL_DATA} -m 644 ${CONF_DIR}/smbldap.conf-dist ${CONF_DIR}/smbldap.conf
+	${INSTALL_DATA} -m 600 ${WRKSRC}/smbldap_bind.conf ${CONF_DIR}/smbldap_bind.conf-dist
+	[ -f ${CONF_DIR}/smbldap_bind.conf ] || ${INSTALL_DATA} -m 600 ${CONF_DIR}/smbldap_bind.conf-dist ${CONF_DIR}/smbldap_bind.conf
 	${INSTALL_DATA} ${WRKSRC}/smb.conf ${EXAMPLESDIR}/
 	${INSTALL_SCRIPT} ${WRKSRC}/configure.pl ${EXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/smbldap_tools.pm ${SITE_PERL}/
+
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/doc/smbldap-tools.pdf ${DOCSDIR}/smbldap-tools.pdf
+.for i in ${DOC_HTML_LIST}
+	${INSTALL_DATA} ${WRKSRC}/doc/html/$i ${DOCSDIR}/html/$i
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff -ur smbldap-tools/distinfo smbldap-tools.new/distinfo
--- smbldap-tools/distinfo	Wed Mar  2 04:56:20 2005
+++ smbldap-tools.new/distinfo	Tue Jun  7 20:45:51 2005
@@ -1,2 +1,2 @@
-MD5 (smbldap-tools-0.8.7.tgz) = 11564bd9be125aa8e356d14464507522
-SIZE (smbldap-tools-0.8.7.tgz) = 288685
+MD5 (smbldap-tools-0.9.1.tgz) = 12ddaf6393420ee24c4af94152e9ee2e
+SIZE (smbldap-tools-0.9.1.tgz) = 295169
Only in smbldap-tools.new: files
diff -ur smbldap-tools/pkg-plist smbldap-tools.new/pkg-plist
--- smbldap-tools/pkg-plist	Wed Mar  2 04:56:20 2005
+++ smbldap-tools.new/pkg-plist	Tue Jun  7 22:41:19 2005
@@ -2,25 +2,42 @@
 sbin/smbldap-groupdel
 sbin/smbldap-groupmod
 sbin/smbldap-groupshow
-sbin/smbldap-migrate-accounts
-sbin/smbldap-migrate-groups
-sbin/smbldap-migrate-unix-accounts
-sbin/smbldap-migrate-unix-groups
 sbin/smbldap-passwd
 sbin/smbldap-populate
 sbin/smbldap-useradd
 sbin/smbldap-userdel
 sbin/smbldap-usermod
 sbin/smbldap-usershow
-@unexec if cmp -s %D/etc/smbldap-tools/smbldap.conf %D/%%EXAMPLESDIR%%/etc/smbldap.conf; then rm -f %D/etc/smbldap-tools/smbldap.conf; fi
-%%EXAMPLESDIR%%/etc/smbldap.conf
-@exec [ -f %D/etc/smbldap-tools/smbldap.conf ] || cp %B/%f %D/etc/smbldap-tools/smbldap.conf
-@unexec if cmp -s %D/etc/smbldap-tools/smbldap_bind.conf %D/%%EXAMPLESDIR%%/etc/smbldap_bind.conf; then rm -f %D/etc/smbldap-tools/smbldap_bind.conf; fi
-%%EXAMPLESDIR%%/etc/smbldap_bind.conf
-@exec [ -f %D/etc/smbldap-tools/smbldap_bind.conf ] || cp %B/%f %D/etc/smbldap-tools/smbldap_bind.conf
+sbin/smbldap-migrate-pwdump-accounts
+sbin/smbldap-migrate-pwdump-groups
+sbin/smbldap-migrate-unix-accounts
+sbin/smbldap-migrate-unix-groups
+@unexec if cmp -s %D/etc/smbldap-tools/smbldap.conf %D/etc/smbldap-tools/smbldap.conf-dist; then rm -f %D/etc/smbldap-tools/smbldap.conf; fi
+etc/smbldap-tools/smbldap.conf-dist
+@exec [ -f %D/etc/smbldap-tools/smbldap.conf ] || cp -fp %B/%f %D/etc/smbldap-tools/smbldap.conf
+@unexec if cmp -s %D/etc/smbldap-tools/smbldap_bind.conf %D/etc/smbldap-tools/smbldap_bind.conf-dist; then rm -f %D/etc/smbldap-tools/smbldap_bind.conf; fi
+etc/smbldap-tools/smbldap_bind.conf-dist
+@exec [ -f %D/etc/smbldap-tools/smbldap_bind.conf ] || cp -fp %B/%f %D/etc/smbldap-tools/smbldap_bind.conf
+@unexec rmdir %D/etc/smbldap-tools 2>/dev/null || true
 %%EXAMPLESDIR%%/smb.conf
 %%EXAMPLESDIR%%/configure.pl
-%%SITE_PERL%%/smbldap_tools.pm
-@unexec rmdir %D/etc/smbldap-tools 2> /dev/null || true
-@dirrm %%EXAMPLESDIR%%/etc
 @dirrm %%EXAMPLESDIR%%
+%%SITE_PERL%%/smbldap_tools.pm
+%%PORTDOCS%%%%DOCSDIR%%/smbldap-tools.pdf
+%%PORTDOCS%%%%DOCSDIR%%/html/contents_motif.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/next_motif.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/previous_motif.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools001.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools002.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools003.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools004.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools005.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools006.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools007.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools008.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools009.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools010.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- patch-tools ends here ---

begin 644 files.tar.bz2
M0EIH.3%!629369#S>'L`**G__/^P(/!________?______\`$!`"!``"H``(
M(`A@*"^^^.YJ#MF(ZW!=]=NWSO=.8:LO?>]-VU7<X#O63W;SOKN'OMNW+=>I
M7H:`KGW?3VWI-L$2J>[U[ZRE%5G5FY7&=UW<./NYU69LLIW;JWVS[QW?-QMW
M2;4-K/'&H[-N=J2%&GNPDD$`B-J:;4PFIE-L4])Z%/4VAI/5/U/4]&E/:GJF
MGZ)M4VIYI)B:>FFIIM0--J"4`@@A`$FT4/U-30;*,@]31DT`!H#0``````T9
M$A4,CU&@VH]3PIHT`!H]$-`!M0`:``&0`!H"32B$1B-"&32I^II^I3]$R3]4
MTR?JGJ;*>HT/4`,FAD``&@&0`(DB!)HR::`F30:2GZ:>J>FAI3U'E/%/332-
M&FC]34](]1H!ZC0!IH,)$1`(T`)-38F2:9/5/&II,GE-J;*FVJ:;%,AZC(:'
MI`TT:-`#3]8(_`$.#X-_9.9CV_U]/W];IXN',WK)LZ0;M-)A!$$,38QZ0``E
MB$<`^YY;O+/='=#[K(>4O*9:D-20`3[@2E$I-<`2A0QUV!"@$*4E$)6!*08`
MR)`:!*![3ZPT"VTHJHB+V_T2':)/0GF,^?T7'?<]X7H.D4'I:U"J-I;27Y)]
M3%CG_3/^T='`]YP>IF/3R-/3;-.-7NDPR4WW8O=[:($1I-/ZN%X/:T2@VE,`
MY:XQ2=4[*?L>_GJ$MVPQI71E2A]C/0FBK=VJYM^[\&4GP'^;ON9@S\^,!#Y.
M7S+:0*#5,EP<\'6,T35-!_795R>:[;L[9<%=;:EL60R*,N[K*AQM(+HYW^_A
M'5_#'UT(&&W]DR#87ON\"S(O<6O6/JR4RB>QZ\'Z33Q:1AZ7<X+\=PJNS[O?
ML,]ZOVDQ#XTJ9HVX`KL8Y6K7.E#..K^?CDO;IA==]LA,=K>REF59H82,01U/
M(TAW.O`8"S8]9551/LWZF(?3P:,A[4)XLTFYA5@"@6/V+7AZ=VIOAY7:$4VX
M`%<JL0,K>M0PUFCBK;/K\=TWQTB#P_CO.UE`*ZX>!TM!Z,+9=I;JNJ&+HJC;
M4'.PN-78^--^NL'2T-G9TGTJ!J[T[/*Y4ZCI*F)#N8;W@N)?N]5V3(&&XH:9
MS!8?$K>&R;YXLZSQMU>8/)"@$D^0$N)`3N4,:`2RJA\2K&`:,.B`(43=%2I4
M$N`HG9YB22.JJ_+]=!;\Q]I:Q/L@E"1)H`'!F,([[*K%?G*EEDR)S#!\6N@'
MBFNB?>:JJJX#^7ZNKOR<V2'<R2AL(.Y+T=L)LZW9TVC#8K2V@6K>*.:H3*P0
M8;I\YDQB7YYOQ"S/]DYQ'BR/CO&XP[T6<S#-V"'!!UORX7K^>=H8.#`.'`67
M@IJ=0DVF'1@C',@E6/W,@L\<:GWZU,O`#Q]H@]<0(:W?BLWZ7@Z3N9:QGZ_]
MBXMJ[2"]%+X_.?;^NJJMX[^?*IB88P<8#4T[EG$@0U$14WD*%C$']$)%Y4@-
M'9A):\AX61M:E-7VTE9/)F9$,=Z[H;X#)W=8W^'TCV5.\5#`NUF:#[9$=8_N
M%OM_1DOG)+Y/(VE"`(YN_IF=4<-`TH:/!=!,D*K`J_`-S1:&-%0A(DDZRU@7
MN<^+?V3Z=<F20X@\+O!\(%_EO7FAK4.)HQ9XX@I6G<^6MJ_QQ4'%R=)YD_S(
M<%:(3#J.7ICDE(03252&$GG>>6B:)1%:HHMWL3C8.=(`K<V%I!K&9C$8'&'H
ME@5K``:,YI*).P\Q,%U,9(&8_'P)/V]29V&_N/$(\;_`D#7DU$,TC)P#!=OG
M7!X-N4\3Z9EZK&=P.*\4%E+(B+)?*,^6IA]N74(Z(YJ1&M4A([^NSHY:435K
ML-HWRZURF2M'9X:V0<%U(.\TB./09[K"QH[_:1T.!M#=Z=/\7'\/E-]B+IWT
M"J'OK>6T!*A>=<N;G@PU*NNQ,0;6/Z`8\.?631EMBD*&8\J,8/BAS,:L)V<=
MK61<O/<OM==[I:_PI+!Y%2OB2:*8P!1"(>J6EB9SE(YP]APVF`9/W>>WG^/R
M\=T\(>P`QZ^>'4`3'59JFJZPGE'7U]K^H`M+,[A(O^[`*2OX9OLSTB%_K+HE
MA%R1*\G3WEFUIKZWJ-W.XJ$7+FG"BG\MIX(EO5;^MS<\.U:+;;D6ND-.YBK*
M!=\V;\#O[K^W(/<]&N!5.5?OQ]/!N/7ZAQ^CL1GLUBL8I5/!J8GSGVCK[/9\
M5LR.:8YQRJ5>=BO1X]!)#H7Y8/-59H8T1[I;O0\W,VE5DX8.'=TZ3CIP)Y\C
MUKO64V6GFIKV;R*K[(9[95?>MMIV<2_;M;;;G<K.##$S`/2`M_KG2`>#/I2Z
M.NN,=U>_JKFR%$1!3\JJKE0J-[IUO85MSLZ=AKZ2]#`_!9IZ@NQ>G5COT4I2
ME-1Z]FS/5DJ6;C4P;3;8W[D!`?/X+>2KKSA,J=;2+LG8PUP*.B6Q^XE$@PY#
M,FIP.#`;)7`YC@?A2UG,NJ\Z3&@Q^]IRS'6JT>_CO-O1E@N[#6A'2T##,P)D
MW<MEXIQX7X::$7\!V]N]4$U_2OT(+QC=:QU=+U/">&TR+VW-.SSEN!Z')*,[
M\M]%W%X^>CCX\0#\NOX$C\K46%M:T#(^X[6[NUYVG&N9-R6.X#D"+",HY1AE
MI`L?D@XB=-H=/O78#RT7V1?T[`KK9R&J59W=C'>%PQ9OHG5UWV&F)8A#S&WK
M[]7?:TJJMMK;SQ5Q;:VMM5R%NZ3=V_L=.QR9KIXX:N@@VY(\4X4:@<'"5;>5
MPW!C=CHYZ8;<;=9</F&'H&L/,^%RVY#>).[1^-)J%E2X[I0HJA!P(U+AA0`P
MW`(U#!C0#'<6]&X-%`9X=,MYJ#:;L[-&<7:WQIYBS9B;=D+'@2,9MQ/$VC$8
MJR"Q$5$6`L16"P4/8R?'USS3TEV^3HR#)")'PM-0@1@=@3;`[?MNO^F[FW3N
MYIF.7,TR"M:MT^[80>>C<&A"QJ'Y#EQ>CJ`/=./GZ/?G2DGJP0Y"80QBE4%4
MM"';WP8T6SBNZ%*P)Y^D\H6E@F0"O6_K])8*&8]:D%!)#JD1%53J0J,:G7C!
M@<$^'/Z-)N&F]5A)939PAL.%EBD_&N`/G<"KC4PNN#.F!4"]PN4"D!)T,G-`
MP]K;P#V#B.Y"_BB)L)UE2EW"1($`=^]KQK!3W(I[(DGYX)[)8@W_AK"RM.(L
M`C_49?UPO%<WK^G\+)@[WBAR>D`^N(!<"N1H&@-J5*-]EU88514.:RMX`DO,
MIE6"HX8G]UF$^_O,30R>!;,&2BE83@]UZ<!60RZ)Q$P6SIUVQ.N/!".-L#2M
M*)VG+MQ,@C&(H(CQN0IKBIP9/Z70%!DU>+51/K%+$YHJD67)=[^4(3?&3BSV
M?,0"YFP@>"*814%#^\@#V`-!`@'A0#0>JAAP(51%2/D0T>>6^@[>OO09S/V3
M[>YJE24N]5:IF\=3D4,3B$4/+0`R2;"N8$%84"AC(<1$@Y'G^MV9_7A_!EZ?
MQ>><`#Z$!>$=:<&01#Q9)\W8R2SO3[0';C`;.HA@<G.S%I\+,8A0T;@LU](&
M"^Y,J$^!`+1>9L-$DM<=`!(4H"[&8,.[1"1CK/DS/>ZMWR7:+\O9\WMT#AV^
M.9TZL669P?3)#?TU@GX0:#6R.38J$([JGV*<M8?VJTM0=]7KCZR*H;<!:Z5&
M[3A5@8RS(J&P%C<'2.8O47OS=<42:RN"@:ID3QU,T0_E.:RM)=0T=%;*XLJ8
M_7KA.E%U6?#X.#YQAUST@'F-A@>+X`>C=K^I%6JS\*A<$;F^\@74+J%U`(*<
M,$;Q7(]DM-_#JY>(N56#"N6_:>W\/KGF6QU`8PO=X-40"L1"UW[E#W\8^V0#
MLYSVRKW??1C0J8M.A-<(PI=C,(Y%&L@5U&IXK4008"@%0K$I),X9KVN+<;$0
MLL7EJ'L]8*6[VE;6W6WWNR:NZ&K+[I>?[36'L[_Q!YPZ4(#J/OI`X/3#L+J'
M_:A@%C\E!Q10,H`0DBFTZ/6"'B'<)H8GTP0]@8T_!MD\E5QOFOZG%Y"A*`<E
M3*22.[7?%-!H<$:!H*4IS&QA8-!)`()E<T`,D`I,;Y#=%NGPADMK);T\I`GC
M`\1=(OD>DH#9=(%U39\U\[60R]*T'CFR:WR#W"4MI;9;2VVT;2^R<C/NI\^.
M]^XX^>XS*ID=DDS/P,HS"9OXW[T;/P,">@\O(?7GD=^E4?0QH4RW=G`L@(A4
M?I4_,4L@,J]\!_\'.?#<0$2#<@#@L*(#GZN)Q1BCV(R&!RR%VMM%,C`A:2)*
MJH2JK,W,['8))1_BKKY]2'N";'5D!G"?D9AOXBKS=&JJM:JKK"&AP/98U<$,
M`(Y=X6BJJJ"B@N!+`$2\`-ZAP?5QEB`V!/!\?WD0;$1DIGW_-Y_/92GS3%HI
M\)<&`6'Y)7/"AI#++G?Z_5V;Y0A`K4VDI[CXB0*)Q`CW`A@27Z='HH;UO=/^
M2DZK(7Y::^2!&D$9`C"=P!#1F"-W-MBY:*C"(%N>L0B`L.V(<KMI#`M'D7P&
M^`0VLV*54P2(#%B^\%;^4'>.[V&S`]OXH-FK5S6YX:LD&A)&-==Y02]O:9J>
MLQ0-U#(^UN4)P6_F)938CH%3FS*MO8XVL,((J7USALK>R"!8V+YHLHAQ6K+-
MET2[3+V%;;08<AL?)Z[]CWZ>%E%K?J41;NWTBFA@^?2.R>*<QS<Z-G1M<F[*
M@(7MTMT\'."Q+3@6HEXYW^>[S3CM5UI*I'T&UQT6](0VQI".<)L1AYT*;=F3
M76D9V6S%)'(-T$M?5LHVT,\%V9%O0NNCS-U--=$0IP=<,TUF*DL\WRLN./>8
M2&9LS*SOH(#'28;4Z]MPR0B!HR-M&J\;322*J2SJ.RPKTR#\UGVBGHX$Q%-P
MD%4I$"S:"XTW4O:FKQ)):EB6&JZ+M`D$R.7,B%@9=TWL1.FX^L/K>7CJ78BN
M7H-?=:$?ELQJL(8IXA66!`;DQ?DVN9/;J%F\3E>.CCJVM$P@@7I>0@ZB"J<S
MY"%`T9I.J7.>SWM=D;'!Q9XS`/AD1ULR71`42VM[V)E`&5[S!92B+8'C5!E0
M+U9<3EYO9"50A4";7&BRU8:$J'-A^1>)NZ:<<3#UEM;QEXJX@/8BF,]6R!HJ
M$IE=(8G)+IIVE<#>=8N/$-H:.,C<2H?-YX+6LUIOE>&G09"5AJ.?T00#//\Q
MUH]U?8/H]!9;Y76L_-))EIESI5.X4>DT<+)8\M`)UX[.GH=^D#L4)B7=\F"0
M+(N)64C)AA*,KA$&A@XB[ZQR05^KWO\=GO=NO-?=WWAO^SZGI+R\W/D[/)Y.
M/XGG+=RY3JG/=&T$_=&<[(YR=QJD@GS:V8ISOV#[BP[FG=A(1HUXGAW>""`^
MKL(M="S916.NS&WUM7,=GTS:SNHLADEW-"+YW)7$'!%H@9N+F$(D@81_%#AR
M0W[U,L">_ML2,8Q,UO"10G1J]^B%L0&+25$6!C:;;<ZE@,9D3!+*,Q:EIWN;
MZ,T4VE=6=+1@T*IZ?-<@J4^M,<E(<WO$K"D@N_'2$/9/8]=$YT,JZC;03706
MB&FVHJPVQ'ZM$A6A9IHD+X70FD0P3:5D$&ZKG'U;:%:E:UJ%&58FG%)MVWDS
M1\#&V0);P;0FCE>OE0@S*:)H,FHS<[&Y`6FIX,;+A:O[@U7^*'%%\GSXA=*,
M8XQ$3H9QL$;R5V\Y0;&+]7<EN0GQ`*L^!=WZGNG34HS](D`2@@/.D`9'"#"P
M>+R?2H]_O^"7ZR8A:ZN23;$CZ5QBN;_(`=Y""-Q;AO%!F8+;""G^;\R4B1!<
M,'KRQN@;=UO#=^%/.=Q93^[]"ZEB9[A[MYOJ)'NS6%D`*/*1T`&JF)YQ!Y@G
M4S%%GBZ-:ON6"1>E$!6_N("D`^<`[`@-@`BL=#GG5*6K6`GAI)`7`!R2,*8]
M=S%A7C>1!8C<VC!`P8P!AD!65N6%`7F`.!2TB":`*>SD!#T=L`X2@!3E,7:;
MIJTI1`4^WNJU.W2.S2#DA9M@0:OA6.)8&,N00%]84D2&.U:)X5+8RXX)'&KA
MI`%S`S^S2L$KO%_CT2;%;M$"-N?@98+<;&1Y06!GW]8\X(^KH][WU=<8F/C0
M'C03V<M#"Q-W`'F0$(^W^=8"`[]W=Q1\MT>26.3BLX09KL+>6)N$`ZRK!B""
MHU4BH^UHW+X!;P\W6;4FU-5A0%P`<>)EWLB/N1?L[-_/,4,D'*`VTQ8QE9C4
M23BPU+5A&J2\$L00:;%\MQ8CW(VGRI'3VYW^D\5X;1G7V>'@F-HD),2:EYH>
MU0!V6`*,KWB!8;_:NB%Z5\FA9D".L2/@4K,?F\&-!;08=OH]7;0^\&9#:7U]
MP?628$MH^5Z1,XT#C9.C8+C<[5'S=!^339HLO-(]HDTPZ.-WT0&FEJ9G7XWJ
MAQ7ZG3'^.OY/+:TOL/3X,08:M>T.[H0-[R9P`')PX0^-TMKK,W$,M@T1#(#.
M?*Q))W*2222%MB[VF`!G<XPS<724$,C2E3J#!M^^2$A#[NA`JH2X4ET]M2JE
M!I1Q=1E:4@&`@2^QLX=1JZ6?/6E_*1]X$[W>%XDB_6$#PA["E",M^B(6B?JZ
M\$8H;*HYMQH26S)$B1&\=Q!41%M/@`Q<>D$$.DP4.\,FW.?EF.O^%ALU+,/[
M-:W*1#;]Y@B#;ONF)T"-*0]%E2\HBBYKY";OBIA&$$'Z-&,"0<$UNAF0A])\
MWT<UW&"2D";A?V]R;OY#7GXLR"D(,BJ$-H1Q$L8)8<`1=QWH[F8F!SH5<BBB
MX+&HV\3]7>8%ZAP`[6*!WP&1&$1(Q&$9%C$:S!;A.;CK!0P+W<[<;9N5=%2@
M!*D+G49]C.\$60*"32=];<`T-'MOZM.PTQYU)8)VAT6@0Z((68`G(Q5YDGN;
M#R/HS-B8A@,1Q]0IS1)!2",12Z>/0")%IVC,4R`4-2'->PAQ!L,387P41@;'
M@"+`&D'1]FH1;F9^[QW@&7L9^G6C:)?2\M)Q\;S!FWU$+@ED/C]-!=7;ZI-P
M`7_#]RAMLK6H%@L,T?[Y7;]^^(B>`,U_H7LY!0(0!VPT5*F(W#.%`!'X66AM
M?.+NY+FZ'2(>!M#N@";H@5@32//8?:6K?*B76^_QFT-A-'HFX=P;L6&B:F!$
M*4PF89J^19J0E'$$JUI%'224%6$>17@%4DAF'@9E3>ZC!UR89J%+,A<FYQV4
MT`\-;C?4I7&'4AR%1@(B^56P4A-F1=$]S@GM!E`A1J!@0"9%D2@?F;A?ATK%
M-0!#76W0.+8J"[?+R?93N(+P?DY4\V1"/16P-B@=Q!.^<3H!GT>LI26<>Y41
M5]X-&0?P'RA3D>]`:TEDO?\5$/DJ("S->KK>!!#[&PO1>S/P=#&<!'!@ZEV#
MQ),%2-,E3O*:(+V%'K^S5D&0VAX&$'J@IV/&>6RI*'56;SD^5^3WH'-*Y/G+
MBFE0N+PU+L@>2ASZ"I4I2H!][2""/,B#>K(L<[,YS><T]Y2%DT8NNX/=S$EU
M',)MH%X&OR!]8`FZ:]%"YUU+3"EQ10I3#L@%(K%X62Y)K8R6%+BDZX8`N&EU
M]5AK*D)L]0B[3@9RZ6:ZF`AI,6'$Y:2VPR"3=.`,`^Z$VWXD9VGYAYCO$1$1
M@@HB)Q+IQ.9K/4P)QMA2/S1NF7L$=N<>*$HF?>.>M+KQH)"V]NXUEA\2=6VK
M=((O+]B5X,6US@!+"<L.$(@\H8";@'15-@3%V?+X6"J;W?I<.3:H7OD0)T37
M89&\@`K*`5GB;W#`:0+V',+ZBT*U\`=N26"B(994P+(%*(I+B"4#)EC+9ET'
M,T)FB(2%+$X($IJJRELK,J@Q2P>GXUC-$P;;:70(:7SM!Q]OYUGM(52MM5%8
MVRDC+;[\J$<`N(+P[#2*8-R7*ID3[0LD,E)0/(D@R21D)F*0/R@TAF]P:*X9
MNA)"'*?F[*/D]_=EZ3=VQ-9KF`>?HATJ(6"2>HAU(P+*MW!H$\B0;F_XWI,6
MQ`S3P*ABO)F@FVH[R>[(?[\BC[/VX?UQ<6+A_#_OW?K_[]N#P_#T?"[]^,2O
M+XDD&).2%[&+!AZUA`R?CGE+Y/DP<28P+(B3Q`]^)DH?5UDHOB!)VC8T=AC(
M>=?%-::VI6;`,4VEA04Z<:E4+35(,CQ`QBU"%+-K7I/N&:K::`)ZSW0]<(0T
MM/^+H'WY:ZA0X(0*0_E::+S3A0L*,0O8V>`*>X$4/68VIA**8LQ5L&<*!"8Z
M%E,4(<O#G65X0^%3Q)R)5(+E\[6_FH2Z?WQ+HG'K*-G4PK0-6^\](&2^B?!.
MJ3C/N?5.CI7Z/<9'-3\]-72T-8A7/C3:Z4*%Q`,LJ<7X`IWQ.\^BR5>-D9`Y
MOQ0:`3;W)E:0^Z#(V?!0C3D:O$FJY\Y#B=?66"H7O]BP"UD"RX-J"PH,%L8#
M+)!DA#$2:32AC`T(N:"#0N]VYR&)U;O`=.VDSMSCQYL.72`1`$^VFD-E%80G
M63C,D#>>T_@I%()!$#S@';*'$[8(B%34(9])^:8*,;V^$WAV,19JWZEI"B8!
MM2@:!B$6!1@GJ`Z_/7O6T?=ZAS"X\?\!U/$8]X<&;FG4*>$@Y1RQEW"GE%V8
M88F`F#PE`F0_S5#J6(EAW&KD%$%A..4;^J$_^(1#!0SB(K^U!3>OI"`E`1O^
M%:\]40M@:EY!X<QI*G3:@W;&UG:1J*FUNBZK0/V6!DLI&,U.H)3&LZV<H/Q5
MJ:H0]&GO%1`U)4GF$5H#G-_2(<8$&F0!@@(<H]DV>20ZS[.T](0%(=IIH\#)
M6`=LS2/_.Q?)CEY`NF;.@+ST!8!0;,MZN./DJT<"$8"#U#,;Z6C#O`/Q,3D1
M6!M4Y)2B)V!<=L>$C"0H00BZ#X^0!K*!5#[W)"V@&K=4P`V4;\HRA1HY/MSU
MRB1^1G;N/I%C+`I+#S8)RF@M99Y0>TXW3W`MDB613!T4L*8`P4[OA@M!(.^U
M,C*Q$H5SHQO+O,1O_R9)JB`[BNU(5#(>G-!3QCK<NTR:!3!3&$#089&9S<F3
M<:R,D-6*`.D`R>O&DR`M%&0$/$SC@)WJ(CA$#!5B1/(-`Y)D]8MK/>C;*Q+?
M:0VC_&?CTQO2:%JH@R,M$$B1+!H-&LBD@=8Q6U)>QY[^X?S6\H77-1'%1U"&
MG/0ECCU@1@V#73D/])!2\&):_<,9C"5X6!8P(8CA6906W@#D`3&`4U,%Q0#G
MB9S7FT6;]Q=S`-P*'.).`)M4.\>7'D,3(6JYR9DC.`$D"RGD'F;-<K@S,6P(
MB.ID:Y;DW`"VQ?76G""<H!?.BA`8&2#E#JR4;"$"*!A<'L!Y>P0,H`TF`?(=
M8)P1RG/%@0LY"@80$*0\SD`6'!5F_Y7-!,`'([.D$N#8/:H#WPFX+F3*`^6*
M6GH/.J/2Y7)Q[.<7MX#'Y%"M#7A*3U6T0'I(ND4P<44ERXDD3BON:/%GL6EP
MC-O3QTB6I`@J8/OI0#.H9,A(>,YH^`\DC7KZ!,&KFQ+8&LQC%(,,(9<"!G*/
MIJ%R-Q2,1!CV63.-Q2,"Y%&B+(=%*D2DW'1ZCLM@*L>?S!T';YO`3R@F3!2S
MW?$G'.@Z:DN%$5$1,PACZ](413-0]'1ZN14XT+KJ?*'A-,3>>K@OS&^>]JU#
MF'`=&NKKDZP.0X)I1MXX!\2Y"]S,\5]<`@,.)@X^[/R?+6E*5DL&0,98T[(.
M@8KD<&L&"O3`.V=_<$&"$KAG?`%@:%")NR\EIO3@90UBZ\CD@HEKZ0#$$4R:
M6MF<A$+84,(48HD8+$,5I8&6@BP6<,C25##46*3SL\"`:LSB&AKA<+*U$$D#
MR0*@'PFQ/>#4SF$S5Y0S3="9$@%D0*QS<64^7Z(![?AC.1P(F-SQ!U\.\[)?
MVEK?#P;=1QPB$C%.N![=MXAVW%\*A2ZT$8D*0A(1YVD]0@X$V%G@\4DKHXM)
MB&G>%!R@'YP38^WT)SBGX(R*`I#/1T@/$0_`AR8812=,2QB,Q%2:I)B8$(B<
M@!@LY^,-@SU+M:MX^%JD.[PS$*=Z*_HK[I'%.+6[+O+F'PIL4RZ9IEH<:5A%
ME6N>H'!GI4NE]G>-'I>#VI-F+Z@7%4H#&QM:(>FP-A59#K11/9240&!#(FVG
M$==RR2L;WTERF7-$8Z=%F`8^<9=R&O-QZ%YF0C^(.E!\\A\E8;.8^(C-^6J,
M4O+F(Q!*VU`<,T;]YP.*!'!`T"Z&I`+@^/MA4*EY*C"`H$A.\5(6&O,L38H8
M,['*`6D]`:<N2P?#,Z>=ADDP+S(-25YO"L-F\TG#C,1$E!6)]BT3-,A'$Z8/
MJVSJZBC6B5H)6-%%%&TQC`IB`%M(E:,J+1*BT!0-84&&+)JF?>P4UTQ;<"^?
MH,N69Z%!TDVHADG,R0@)`B0"`B[:N@^:E4J`BQ&34Z@!14$KMDD><Q42@+7*
M@DS#0#!@P8,&%1=#7&S.)`F"<<9#S27HC/.$)&=CZ[[2ST"(B*N,$P'.0A"$
M(5S(5R`E<QSTKOAP11*V3;BVN=4`$V]%4D`7&3QF!XP[(!&$B.A"I5J/GVSJ
M24J,-BSLTF`NVQ,&PLE39C(B&05$NM8:,H25>V+P:)H744J@41(:-%5SEH!O
M#(1JZ*1Q!,_H!P;#GB`4QBP(JI:OT=,A?4`4N&AL+&(('G,LA\D9&&R&D!L(
MF%9'`\^K5?,R(ZX\3`*@RHBW"Z5U/!7"6A&%D?+%=6(<ZXL$8E`F%!X`H8C'
M$E&`T@A@TD-NNG(":)W4SD`)5FH`J,`U%`OCJ-*+X!1\"XT$3XLE^52CO.>X
MH=!S'D9:^\-ZN]N_,#L$_P4?6/9QGCUAX>0>P;7.?$;`$!D5#%Z!:'A(!(`<
MJ=D8>!]X"9J!W1!,R($/*\--B,B!YF6]J'?C=;/&(]V>)V5H8/@,V%SQH0?*
M>D$7&M,VEK9,>'WTETWX$")YA*==#Q>,`T#:YJ4_J`8'"PRT-1'P"!A($08!
M*#_\$GAG)F4'3`.:RZLQ`]^`ERX5MV$#$BK/7Z+(G&#%VX1X5!/(P"NT`5`A
M$%6$<[0],ZI97;#L\@%/84FGC\4A4EKD0)*6!1&K.[8S31>^9#@@.T.(=>8(
MES]`@0?;)#VD\<6X!`3^U,0D7\37FW8"VV1G&$<;'=9!LLS1X"#S"V`T%?`*
M"E&&.,!P93"))NOSQ)Q='##Z$9<@M^H`JD!\!-,ZGSJ\`H?K%W)%.%"0D/-X
!>P``
`
end


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->flz 
Responsible-Changed-By: flz 
Responsible-Changed-When: Thu Jun 30 16:27:18 GMT 2005 
Responsible-Changed-Why:  
Mine. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=82830 
State-Changed-From-To: open->closed 
State-Changed-By: flz 
State-Changed-When: Sun Jul 31 16:59:13 GMT 2005 
State-Changed-Why:  
Partly committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=82830 

From: "Dmitry Grigorovich" <odip@bionet.nsc.ru>
To: "'Florent Thoumie'" <flz@xbsd.org>,
	<bug-followup@FreeBSD.org>
Cc:  
Subject: RE: ports/82830: [patch] smbldap-tools 0.9.1 + many FreeBSD patches
Date: Mon, 1 Aug 2005 17:11:43 +0700

  
 
 > -----Original Message-----
 > From: Florent Thoumie [mailto:flz@xbsd.org] 
 > Sent: Sunday, July 31, 2005 10:59 PM
 > To: bug-followup@FreeBSD.org; odip@bionet.nsc.ru
 > Subject: Re: ports/82830: [patch] smbldap-tools 0.9.1 + many 
 > FreeBSD patches
 > 
 > 	A major part of your patches is to replace hardcoded LHS path
 > 	with %%PREFIX%% which is not really satisfactory in the sense
 > 	it's not possible to send these patches upstream sa they
 > 	currently are. Using sed is way simplier to maintain, though
 > 	it's not perfect neither. If you can find another way to do this
 > 	that could be integrated in the smbldap-tools distribution,
 > 	please contact the developers.
 > 
 > 	In the meantime, I'll update the port before the freeze, thanks
 > 	for your submission (and your patience).
 
 I see updated port - none of important fixes applied
 Code from smbldap-tools developers not all worked as needed
 I need wrote small patches
 
 Some patches are specific for FreeBSD and probably not needed for
 smbldap-developers
 
 [ODiP] == Grigorovich Dmitry
 

From: Florent Thoumie <flz@xbsd.org>
To: bug-followup@FreeBSD.org,  odip@bionet.nsc.ru
Cc:  
Subject: Re: ports/82830: [patch] smbldap-tools 0.9.1 + many FreeBSD patches
Date: Sun, 31 Jul 2005 17:59:13 +0200

 This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
 --------------enigB1DE3E2B2C1008DCC51E6D93
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 	A major part of your patches is to replace hardcoded LHS path
 	with %%PREFIX%% which is not really satisfactory in the sense
 	it's not possible to send these patches upstream sa they
 	currently are. Using sed is way simplier to maintain, though
 	it's not perfect neither. If you can find another way to do this
 	that could be integrated in the smbldap-tools distribution,
 	please contact the developers.
 
 	In the meantime, I'll update the port before the freeze, thanks
 	for your submission (and your patience).
 
 -- 
 Florent Thoumie
 flz@FreeBSD.org
 FreeBSD committer
 
 --------------enigB1DE3E2B2C1008DCC51E6D93
 Content-Type: application/pgp-signature; name="signature.asc"
 Content-Description: OpenPGP digital signature
 Content-Disposition: attachment; filename="signature.asc"
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (Darwin)
 Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
 
 iD8DBQFC7PVWMxEkbVFH3PQRAtdBAJ9s+zMwWjOq5ZWNU9jNx52gmY4D2QCeKI24
 0fuK+kwMm0d8ZsjwxprTJNA=
 =DvId
 -----END PGP SIGNATURE-----
 
 --------------enigB1DE3E2B2C1008DCC51E6D93--
>Unformatted:
