Date: Thu, 23 May 2002 16:51:07 +0600 From: pavelsh <pavelsh@karavan.chel.com.ru> To: freebsd-bugbusters@FreeBSD.org Subject: Bug in /usr/bin/patch Message-ID: <19121890256.20020523165107@karavan.chel.com.ru>
next in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
Hi
I created a own port of basis port /usr/local/security/fwlogwatch, and
put in dir /usr/local/security/fwlogwatch81
Generate file patch-aa by command "# diff -u Makefile.orig Makefile",
where Makefile was edited by me.
Then:
# make patch - all ok
But i see in file /usr/local/security/fwlogwatch81/work/fwlogwatch-0.8.1/Makefile
in string 42 - "${INSTALL_DIR}/usr/local/etc".
But fragment of patch-aa (my port in attach)
-CONF_DIR = /etc
-LOCALE_DIR = /usr
+CONF_DIR = ${INSTALL_DIR}/etc
+LOCALE_DIR = ${INSTALL_DIR}
If "# make -DDEBUG_PATCH patch" /usr/bin/patch print "all hunk ok"!
Bug in /usr/bin/patch?
When I was simple modelling situation in home dir by command line
# patch -p0 < patch-aa
That I have right results!!!!!
Example:
Fragment of patch-aa (my port in attach)
-CONF_DIR = /etc
-LOCALE_DIR = /usr
+CONF_DIR = ${INSTALL_DIR}/etc
+LOCALE_DIR = ${INSTALL_DIR}
In original Makefile string 42 - "CONF_DIR = /etc"
In patched from /usr/ports/.../fwlogwatch81 by command "#make patch"
string 42 - "${INSTALL_DIR}/usr/local/etc"
In patched from local dir by command "# patch -p0 < patch-aa" string
42 "CONF_DIR = ${INSTALL_DIR}/etc"
System: FreeBSD 4.3R, Pentium 166MMX
last ports upgrade: 10 May 2002
P.S. Sorry for bad English!
--
with best regards
pavelsh mailto:pavelsh@karavan.chel.com.ru
[-- Attachment #2 --]
U^< w8b6mX0. Ihʕ<`],qo$0Mn=/[/iF#rS7FMyc
jXWA]_\(bY-k V
Y u8cx!K(0@- ` ,?}ZdhZ* \/
+K@}1>
so$Ɨr=HP %yJ!xyT;}[ DI'R [JcVRnێ&76!-Mq4d ;$ӶпAm@v0??3q6yB/نz+%Pv{(ZnYGHl1}H{dZ~[1rwᐑ0ݐ$1vUw&c/0Z@+se Mu<:L[*hj]5Wt:=GciE U]THϽ= !0s%hRN+jQQ+VBA)ԯ\HJɚԞ\I0Cv7csfc|Tv_ % @>y[v>5uH=ꏰkȻ%y8c 4O|-ûv}~Rz{>}&Xȍ f~2Ǹ ~N-T ->8 !C|\*7 1tKaMLf5#/
Ipf,) MĊi31 |w@7MxZz7um]7mb'gۺu}C C. o lx>X1q{m 7D*_hyH0V4>0ȍV[k6K5oꝶOڵcJm)cb8" ֺu=oz+w ̅%Ġ97$6ڈ<ևY3 rpџ Ԛ&z'yau'(K܅N
bPf8=갬>?;cW0 u0폏<Nl;&8693 oD,$ S~)C\O/]f {8j<A
` siO~tpYf> aAF!$G8q{GGяpnJ4H'qZ<\]2g@ե
RZb,J)ogVyr{;a-/\(&Q=_Qs8ٱ-|<c+tp~{m&k ܬ ܠ2'p3 6!6h[}2ݳ,ZQ&ވԯIUKS 7ǣĆi1a= D?Mkk#少1?F?;ya)eh,cCo-q
݊
-2HaRb8E :8Gp K59ná0<_f5HKL3<װlysaQݑ-&@1:Z{`ZU }`[N1)nT;4NZ 5[j]4֭ nbt\t^#w2NĦO|{~#sZaSEBFnBm/ jg~Zo "[XfsUpQH"LrI,eH|\486fBl+ʥ j:89=oDgOǵO^y7!vݭ%I|YU jWo7xF
2,3߆qH$oN-0VzΒY9e,p^~SoIޞ?uwsEHFzoݯV '.pN)XI4CYLv_(5%);/}ffsd5vϥoRS{<M M?p|X"TfqJÛP5m%ȗ/}RɿӵQLkxq
K߽2 ѥTش/
* R(c; x_7 3畱)+勫뿠. [0oV%
C9aL~O&- 1)祰( }^P}`OXT0R R>ʿ} J%Ix' Pv
C ԻOU}Om|:*r
>ğ v 0dO?.R]!0YoD`dsj8Y01899>`rQ> Y<W\7d mz3 ƨ>]d M! <հ}2jH -M;c\R#TpITP(c:s1q柎 t8SGcꌄ'S[pWnA8 T#d
l"tJ$b& =E"uwKZ =(e`HP9; 0N#B cH*+IgggU/p?]!/WWsłZ^?[RJOƮ@i{!Vʽeۯ/#>Ÿ'˞T-C 1C 1C 1C 1C 1C 1C 1C 1]1 P
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19121890256.20020523165107>