Date: Tue, 09 Sep 2008 02:10:04 +0400 From: Boris Samorodov <bsam@ipt.ru> To: Giorgos Keramidas <keramida@freebsd.org> Cc: ports@freebsd.org Subject: Re: HEADS UP: Ports freeze for 6.4 and 7.0 in effect Message-ID: <04740659@bs1.sp34.ru> In-Reply-To: <87hc8qwf0b.fsf@kobe.laptop> (Giorgos Keramidas's message of "Mon\, 08 Sep 2008 23\:37\:24 %2B0300") References: <20080908120124.GK23062@droso.net> <87od2y30xp.fsf@kobe.laptop> <70828971@bs1.sp34.ru> <87hc8qwf0b.fsf@kobe.laptop>
next in thread | previous in thread | raw e-mail | index | archive | help
Giorgos Keramidas <keramida@freebsd.org> writes:
> On Mon, 08 Sep 2008 23:51:32 +0400, Boris Samorodov <bsam@ipt.ru> wrote:
>> Giorgos Keramidas <keramida@freebsd.org> writes:
>>> My emacs-22.3 release update almost made it into ports before the freeze
>>> by 1-2 days. Is there any chance I could bribe you guys to get it in,
>>> so we can have the latest stable 22.X GNU Emacs in the release?
>>
>> Since it is a security issue it may be resolved before release. Just
>> the patch should be polished a little.
>
> Thanks Boris :)
My pleasure. BTW since you released the PR I've taken it.
> Yeah, the patch as it is attached in the port now lacks at least the
> `bsd.emacs.mk' changes, which I attached to this message. I've
Usually I don't like such changes (to *.mk stuff) just before
freeze/release... But since you are the maintainer I'm not scared.
> resubmitted the patch to ports/127168 in the version I emailed to Erwin
> earlier.
>
> I don't know how busy you are these days, and I wouldn't want to put too
I whish I had more spare time. :-(
> much pressure on your schedule, but if you can email me about the
> changes to polish the patch,
I've just was going to do it and have received your email.
First of all, I'd like to ask you to send me (may be without CC to
ports@) a proposed commit log. And since it is a security issue it
will be good to add an entry to ports/security/vuxml/vuln.xml.
> I'll do it resubmit the patch to the PR,
> and get it committed later today.
>
> %%%
> Index: Mk/bsd.emacs.mk
> ===================================================================
> RCS file: /home/ncvs/ports/Mk/bsd.emacs.mk,v
> retrieving revision 1.73
> diff -u -r1.73 bsd.emacs.mk
> --- Mk/bsd.emacs.mk 3 Jun 2008 14:36:49 -0000 1.73
> +++ Mk/bsd.emacs.mk 8 Sep 2008 19:46:40 -0000
> @@ -83,7 +83,7 @@
> # Emacs-22.x
> .elif (${EMACS_PORT_NAME} == "emacs22")
> EMACS_NAME= emacs
> -EMACS_VER= 22.2
> +EMACS_VER= 22.3
As you may see at my email headers I'm already using the new emacs
version. But it states itself (at the window name) that it is 22.3.1.
I'm not sure why. I was always curious why those versions don't
correspond to the ports versions (i.e. PORTVERSION).
[...]
I'm not sure why the following patch is needed:
> Index: editors/emacs/files/patch-man-Makefile.in
> ===================================================================
> RCS file: /home/ncvs/ports/editors/emacs/files/patch-man-Makefile.in,v
> retrieving revision 1.1
> diff -u -r1.1 patch-man-Makefile.in
> --- editors/emacs/files/patch-man-Makefile.in 16 Jul 2007 17:06:44 -0000 1.1
> +++ editors/emacs/files/patch-man-Makefile.in 8 Sep 2008 19:46:05 -0000
> @@ -1,5 +1,5 @@
> ---- ./man/Makefile.in.orig Sat May 6 18:54:21 2006
> -+++ ./man/Makefile.in Fri Sep 1 21:10:08 2006
> +--- man/Makefile.in.orig 2008-09-07 05:25:12.000000000 +0300
> ++++ man/Makefile.in 2008-09-07 05:25:12.000000000 +0300
> @@ -32,7 +32,7 @@
>
> # The makeinfo program is part of the Texinfo distribution.
And those two patches seems to only rename an existing file
if I'm not mistaken. With all my respect to you as a mantainer
I'd say that you should have a good reason for that and if so
it worth mentionning at the commit's log. As for me I won't
do any renames while at ports freeze. But sure it's up to you. ;-)
> Index: editors/emacs/files/patch-src-alloc.c
> ===================================================================
> RCS file: editors/emacs/files/patch-src-alloc.c
> diff -N editors/emacs/files/patch-src-alloc.c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ editors/emacs/files/patch-src-alloc.c 8 Sep 2008 19:46:05 -0000
> @@ -0,0 +1,15 @@
> +--- src/alloc.c.orig 2008-09-07 05:25:27.000000000 +0300
> ++++ src/alloc.c 2008-09-07 05:25:27.000000000 +0300
> +@@ -4573,8 +4573,12 @@
> + needed on ia64 too. See mach_dep.c, where it also says inline
> + assembler doesn't work with relevant proprietary compilers. */
> + #ifdef __sparc__
> ++#ifdef __sparc64__
> ++ asm ("flushw");
> ++#else
> + asm ("ta 3");
> + #endif
> ++#endif
> +
> + /* Save registers that we need to see on the stack. We need to see
> + registers used to hold register variables and registers used to
> Index: editors/emacs/files/patch-src__alloc.c
> ===================================================================
> RCS file: editors/emacs/files/patch-src__alloc.c
> diff -N editors/emacs/files/patch-src__alloc.c
> --- editors/emacs/files/patch-src__alloc.c 16 Jul 2007 17:06:44 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> ---- ./src/alloc.c.orig Thu Aug 31 20:50:29 2006
> -+++ ./src/alloc.c Fri Sep 1 21:10:08 2006
> -@@ -4560,7 +4560,11 @@
> - needed on ia64 too. See mach_dep.c, where it also says inline
> - assembler doesn't work with relevant proprietary compilers. */
> - #ifdef sparc
> -+#ifdef __sparc64__
> -+ asm ("flushw");
> -+#else
> - asm ("ta 3");
> -+#endif
> - #endif
> -
> - /* Save registers that we need to see on the stack. We need to see
> %%%
HTH and WBR
--
Boris Samorodov (bsam)
Research Engineer, http://www.ipt.ru Telephone & Internet SP
FreeBSD committer, http://www.FreeBSD.org The Power To Serve
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?04740659>