Date: Thu, 16 May 2002 14:13:57 +0600 From: pavelsh <pavelsh@karavan.chel.com.ru> To: stable@freebsd.org Subject: Bug in /usr/bin/patch Message-ID: <14110030002.20020516141357@karavan.chel.com.ru>
next in thread | raw e-mail | index | archive | help
------------24CA1C224B4B286
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
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
------------24CA1C224B4B286
Content-Type: application/x-gzip; name="fwlogwatch81.tar.gz"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="fwlogwatch81.tar.gz"
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
McQQQwwx/F3gf54x1BgAUAAA
------------24CA1C224B4B286--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?14110030002.20020516141357>