This is the mail archive of the
cygwin-apps
mailing list for the Cygwin project.
Re: [ITP] bsdiff-4.3
On Sat, 28 Jan 2006, Lapo Luchini wrote:
> Igor Peshansky wrote:
> >> bsdiff-4.3.README contains <VER> and <REL> from the template. It is
> >> my understanding that these should be substituted for the actual
> >> values in the README.
> >>
> > Your understanding is correct.
>
> OK then, here you go... version 4.3-3:
>
> http://cyberx.lapo.it/cygwin/bsdiff/
>
> and relevant patch to "sed inline" those evil tags...
>
> diff -b -u -r1.45 generic-build-script
> --- templates/generic-build-script 22 Jan 2006 04:35:42 -0000 1.45
> +++ templates/generic-build-script 28 Jan 2006 15:43:02 -0000
> @@ -295,14 +295,15 @@
> fi && \
> /usr/bin/install -m 755 ${srcdir}/CYGWIN-PATCHES/preremove.sh \
> ${instdir}${sysconfdir}/preremove/${PKG}.sh ; \
> - fi &&
> + fi && \
> if [ -f ${srcdir}/CYGWIN-PATCHES/manifest.lst ] ; then
> if [ ! -d ${instdir}${sysconfdir}/preremove ]; then
> mkdir -p ${instdir}${sysconfdir}/preremove ;
> fi &&
> /usr/bin/install -m 755 ${srcdir}/CYGWIN-PATCHES/manifest.lst \
> ${instdir}${sysconfdir}/preremove/${PKG}-manifest.lst ;
> - fi )
> + fi && \
> + sed -i -e "s/<VER>/$VER/;s/<REL>/$REL/"
> ${instdir}${prefix}/share/doc/Cygwin/${SHORTPKG}.README )
^^^
The patch got wrapped, FWICS.
> }
> strip() {
> (cd ${instdir} && \
FWIW, there was a patch from Alan Miles two years ago to do a more general
version of this, but he didn't follow through on it. Here are the links
to the relevant messages:
<http://cygwin.com/ml/cygwin/2003-11/msg00912.html>
<http://cygwin.com/ml/cygwin-apps/2003-12/msg00292.html>
<http://cygwin.com/ml/cygwin-apps/2004-01/msg00042.html>
<http://cygwin.com/ml/cygwin-apps/2004-02/msg00090.html>
<http://cygwin.com/ml/cygwin-apps/2004-02/msg00091.html>
<http://cygwin.com/ml/cygwin-apps/2004-02/msg00297.html>
<http://cygwin.com/ml/cygwin-apps/2004-02/msg00298.html>
(the last message was never followed up on).
As part of that discussion, a bug in "sed -i" was discovered: if /tmp is
not writable, sed would go into an infinite loop. AFAICS, a workaround
would be to always invoke "sed -i" with TMP (or TMPDIR, need to check
that) set to a known-writable directory (e.g., "."). Feel like changing
the patch while you're at it?
Igor
--
http://cs.nyu.edu/~pechtcha/
|\ _,,,---,,_ pechtcha@cs.nyu.edu | igor@watson.ibm.com
ZZZzz /,`.-'`' -. ;-;;,_ Igor Peshansky, Ph.D. (name changed!)
|,4- ) )-,_. ,\ ( `'-' old name: Igor Pechtchanski
'---''(_/--' `-'\_) fL a.k.a JaguaR-R-R-r-r-r-.-.-. Meow!
"Las! je suis sot... -Mais non, tu ne l'es pas, puisque tu t'en rends compte."
"But no -- you are no fool; you call yourself a fool, there's proof enough in
that!" -- Rostand, "Cyrano de Bergerac"