rpms/gdb/F-13 gdb-false-warning-gnu.liblist.patch, NONE, 1.1 gdb-stale-sectindex.patch, NONE, 1.1 gdb.spec, 1.410, 1.411
by Jan Kratochvil
Author: jkratoch
Update of /cvs/pkgs/rpms/gdb/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12344
Modified Files:
gdb.spec
Added Files:
gdb-false-warning-gnu.liblist.patch gdb-stale-sectindex.patch
Log Message:
* Sun Feb 28 2010 Jan Kratochvil <jan.kratochvil(a)redhat.com> - 7.0.50.20100203-17.fc13
- Fix false warning: section .gnu.liblist not found in ...
- Fix crash on stale addrinfo->sectindex (more sensitive due to the PIE patch).
gdb-false-warning-gnu.liblist.patch:
symfile.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
--- NEW FILE gdb-false-warning-gnu.liblist.patch ---
http://sourceware.org/ml/gdb-patches/2010-02/msg00713.html
Subject: Re: [patch] Fix false warning: section .gnu.liblist not found in ... [rediffed]
Hi,
only a technical rediff.
------------------------------------------------------------------------------
On Sat, 13 Feb 2010 23:49:29 +0100, Jan Kratochvil wrote:
Hi,
post-7.0 GDB started to print many false warnings on prelink-ed system:
$ ./gdb -nx -ex r echo
...
Reading symbols from /bin/echo...Reading symbols from /usr/lib/debug/bin/echo.debug...
warning: section .gnu.liblist not found in /usr/lib/debug/bin/echo.debug
warning: section .gnu.conflict not found in /usr/lib/debug/bin/echo.debug
done.
done.
Starting program: /bin/echo
warning: section .gnu.liblist not found in /usr/lib/debug/bin/echo.debug
warning: section .gnu.conflict not found in /usr/lib/debug/bin/echo.debug
warning: section .gnu.liblist not found in /usr/lib/debug/bin/echo.debug
warning: section .gnu.conflict not found in /usr/lib/debug/bin/echo.debug
warning: section .gnu.liblist not found in /usr/lib/debug/bin/echo.debug
warning: section .gnu.conflict not found in /usr/lib/debug/bin/echo.debug
These sections are from prelink and they are not present in the *.debug files.
It is formally a regression by:
commit 3bfec189bb0fa1a2a44f1645dd68a9572e7a841c
2010-01-07 Tristan Gingold <gingold(a)adacore.com>
* symfile.c (build_section_addr_info_from_objfile): New function.
(symbol_file_add_separate): Don't use offsets from objfile but
built an addr info.
But I think would be unavoidable even for the unification of PIC+PIE handling.
Found no usable section flag differences for .gnu.liblist vs. for example
.text so used just the section name for the exception.
.gnu.liblist/.gnu.conflict related dumps:
executable:
Section Headers:
[Nr] Name Type Address Off Size ES Flg Lk Inf Al
[ 6] .gnu.liblist GNU_LIBLIST 00000000004006b8 0006b8 000028 14 A 28 0 4
[ 7] .gnu.conflict RELA 00000000004006e0 0006e0 0001c8 18 A 5 0 8
Program Headers:
Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align
LOAD 0x000000 0x0000000000400000 0x0000000000400000 0x005254 0x005254 R E 0x200000
Dynamic section at offset 0x52c8 contains 24 entries:
Tag Type Name/Value
0x000000006ffffef9 (GNU_LIBLIST) 0x4006b8
0x000000006ffffdf7 (GNU_LIBLISTSZ) 40 (bytes)
0x000000006ffffef8 (GNU_CONFLICT) 0x4006e0
0x000000006ffffdf6 (GNU_CONFLICTSZ) 456 (bytes)
library:
Section Headers:
[Nr] Name Type Address Off Size ES Flg Lk Inf Al
[74] .gnu.liblist GNU_LIBLIST 0000000000000000 249940 000014 14 75 0 4
No regressions on {x86_64,x86_64-m32,i686}-fedora12-linux-gnu.
Thanks,
Jan
2010-03-01 Jan Kratochvil <jan.kratochvil(a)redhat.com>
* symfile.c (addr_info_make_relative): New variable sect_name, use it.
Do not warn on ".gnu.liblist" and ".gnu.conflict".
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -597,7 +597,8 @@ addr_info_make_relative (struct section_addr_info *addrs, bfd *abfd)
for (i = 0; i < addrs->num_sections && addrs->other[i].name; i++)
{
- asection *sect = bfd_get_section_by_name (abfd, addrs->other[i].name);
+ const char *sect_name = addrs->other[i].name;
+ asection *sect = bfd_get_section_by_name (abfd, sect_name);
if (sect)
{
@@ -614,8 +615,16 @@ addr_info_make_relative (struct section_addr_info *addrs, bfd *abfd)
}
else
{
- warning (_("section %s not found in %s"), addrs->other[i].name,
- bfd_get_filename (abfd));
+ /* These two sections are intentionally loaded into memory from
+ the DYNAMIC segment and so they have both SEC_ALLOC and SEC_LOAD
+ set in the main executable (not in the library files). They
+ are not present in the separate debug info file, though. */
+
+ if (!(strcmp (sect_name, ".gnu.liblist") == 0
+ || strcmp (sect_name, ".gnu.conflict") == 0))
+ warning (_("section %s not found in %s"), sect_name,
+ bfd_get_filename (abfd));
+
addrs->other[i].addr = 0;
/* SECTINDEX is invalid if ADDR is zero. */
gdb-stale-sectindex.patch:
symfile.c | 30 +++++++++++++++++-------------
symfile.h | 2 ++
2 files changed, 19 insertions(+), 13 deletions(-)
--- NEW FILE gdb-stale-sectindex.patch ---
http://sourceware.org/ml/gdb-patches/2010-02/msg00477.html
Subject: Re: [patch] Fix crash on stale addrinfo->sectindex
On Fri, 19 Feb 2010 04:01:05 +0100, Tom Tromey wrote:
> >>>>> "Jan" == Jan Kratochvil <jan.kratochvil(a)redhat.com> writes:
> I think you ought to move this comment as well.
> It appears to just be hanging at the end of a block after the patch.
Yes; forgot.
> This is ok with that change. Thanks.
Checked-in.
On Fri, 19 Feb 2010 04:10:30 +0100, Tom Tromey wrote:
> Oh, by the way, I think this is reasonable for 7.1. It is
> straightforward and fixes a reported crash. If Joel agrees, please put
> it on the branch. Thanks.
OK for the branch?
Thanks,
Jan
http://sourceware.org/ml/gdb-cvs/2010-02/msg00162.html
### src/gdb/ChangeLog 2010/02/19 00:35:53 1.11380
### src/gdb/ChangeLog 2010/02/19 06:19:44 1.11381
## -1,3 +1,10 @@
+2010-02-19 Jan Kratochvil <jan.kratochvil(a)redhat.com>
+
+ * symfile.c (addr_info_make_relative): Extend comment. Move SECT to
+ a more inner block. Initialize ADDR by LOWER_OFFSET only if it was
+ found by bfd_get_section_by_name.
+ * symfile.h (struct section_addr_info) <sectindex>: New comment.
+
2010-02-19 Joel Brobecker <brobecker(a)adacore.com>
* NEWS: Add new "[...] since 7.1" section. Rename the "[...] since
--- src/gdb/symfile.c 2010/02/18 19:17:00 1.272
+++ src/gdb/symfile.c 2010/02/19 06:19:45 1.273
@@ -562,13 +562,13 @@
}
/* Relativize absolute addresses in ADDRS into offsets based on ABFD. Fill-in
- also SECTINDEXes there. */
+ also SECTINDEXes specific to ABFD there. This function can be used to
+ rebase ADDRS to start referencing different BFD than before. */
void
addr_info_make_relative (struct section_addr_info *addrs, bfd *abfd)
{
asection *lower_sect;
- asection *sect;
CORE_ADDR lower_offset;
int i;
@@ -597,25 +597,29 @@
for (i = 0; i < addrs->num_sections && addrs->other[i].name; i++)
{
- if (addrs->other[i].addr != 0)
+ asection *sect = bfd_get_section_by_name (abfd, addrs->other[i].name);
+
+ if (sect)
{
- sect = bfd_get_section_by_name (abfd, addrs->other[i].name);
- if (sect)
+ /* This is the index used by BFD. */
+ addrs->other[i].sectindex = sect->index;
+
+ if (addrs->other[i].addr != 0)
{
addrs->other[i].addr -= bfd_section_vma (abfd, sect);
lower_offset = addrs->other[i].addr;
- /* This is the index used by BFD. */
- addrs->other[i].sectindex = sect->index;
}
else
- {
- warning (_("section %s not found in %s"), addrs->other[i].name,
- bfd_get_filename (abfd));
- addrs->other[i].addr = 0;
- }
+ addrs->other[i].addr = lower_offset;
}
else
- addrs->other[i].addr = lower_offset;
+ {
+ warning (_("section %s not found in %s"), addrs->other[i].name,
+ bfd_get_filename (abfd));
+ addrs->other[i].addr = 0;
+
+ /* SECTINDEX is invalid if ADDR is zero. */
+ }
}
}
--- src/gdb/symfile.h 2010/02/03 14:13:16 1.64
+++ src/gdb/symfile.h 2010/02/19 06:19:45 1.65
@@ -80,6 +80,8 @@
{
CORE_ADDR addr;
char *name;
+
+ /* SECTINDEX must be valid for associated BFD if ADDR is not zero. */
int sectindex;
} other[1];
};
Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-13/gdb.spec,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -p -r1.410 -r1.411
--- gdb.spec 26 Feb 2010 08:56:34 -0000 1.410
+++ gdb.spec 28 Feb 2010 23:46:59 -0000 1.411
@@ -36,7 +36,7 @@ Version: 7.0.50.20100203
# The release always contains a leading reserved number, start it at 1.
# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 16%{?_with_upstream:.upstream}%{dist}
+Release: 17%{?_with_upstream:.upstream}%{dist}
License: GPLv3+
Group: Development/Debuggers
@@ -430,9 +430,15 @@ Patch412: gdb-unused-revert.patch
# Fix i386+x86_64 rwatch+awatch before run, regression against 6.8 (BZ 541866).
Patch417: gdb-bz541866-rwatch-before-run.patch
+# Fix crash on stale addrinfo->sectindex (more sensitive due to the PIE patch).
+Patch421: gdb-stale-sectindex.patch
+
# Remove false gdb_assert on $sp underflow.
Patch422: gdb-infcall-sp-underflow.patch
+# Fix false warning: section .gnu.liblist not found in ...
+Patch425: gdb-false-warning-gnu.liblist.patch
+
BuildRequires: ncurses-devel%{?_isa} texinfo gettext flex bison expat-devel%{?_isa}
Requires: readline%{?_isa}
BuildRequires: readline-devel%{?_isa}
@@ -683,7 +689,9 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
%patch408 -p1
%patch412 -p1
%patch417 -p1
+%patch421 -p1
%patch422 -p1
+%patch425 -p1
%patch415 -p1
%patch393 -p1
@@ -1016,6 +1024,10 @@ fi
%endif
%changelog
+* Sun Feb 28 2010 Jan Kratochvil <jan.kratochvil(a)redhat.com> - 7.0.50.20100203-17.fc13
+- Fix false warning: section .gnu.liblist not found in ...
+- Fix crash on stale addrinfo->sectindex (more sensitive due to the PIE patch).
+
* Fri Feb 26 2010 Jan Kratochvil <jan.kratochvil(a)redhat.com> - 7.0.50.20100203-16.fc13
- Fix ia64 part of the bt-clone-stop.exp fix.
- Fix gdb.ada/* regressions (Keith Seitz).
13Â years, 9Â months
rpms/gdb/F-12 gdb-bz562517-archer-reread-quick_addrmap.patch, NONE, 1.1 gdb-false-warning-gnu.liblist.patch, NONE, 1.1 gdb.spec, 1.425, 1.426
by Jan Kratochvil
Author: jkratoch
Update of /cvs/pkgs/rpms/gdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10522
Modified Files:
gdb.spec
Added Files:
gdb-bz562517-archer-reread-quick_addrmap.patch
gdb-false-warning-gnu.liblist.patch
Log Message:
* Sun Feb 28 2010 Jan Kratochvil <jan.kratochvil(a)redhat.com> - 7.0.1-33.fc12
- [delayed-symfile] Backport fix of reread_symbols (Tom Tromey, BZ 562517).
- Fix false warning: section .gnu.liblist not found in ...
gdb-bz562517-archer-reread-quick_addrmap.patch:
symfile.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- NEW FILE gdb-bz562517-archer-reread-quick_addrmap.patch ---
Fix was a part of merge of master:
e421d7b026e77f4dc127de49c01e80d533eb6825
--- ./gdb/symfile.c 2010-02-28 23:22:31.000000000 +0100
+++ ./gdb/symfile.c 2010-02-28 23:29:00.000000000 +0100
@@ -3448,6 +3448,7 @@ reread_symbols (void)
objfile->symtabs = NULL;
objfile->psymtabs = NULL;
objfile->psymtabs_addrmap = NULL;
+ objfile->quick_addrmap = NULL;
objfile->free_psymtabs = NULL;
objfile->cp_namespace_symtab = NULL;
objfile->msymbols = NULL;
@@ -3458,6 +3459,8 @@ reread_symbols (void)
memset (&objfile->msymbol_demangled_hash, 0,
sizeof (objfile->msymbol_demangled_hash));
+ objfile->flags &= ~OBJF_SYMTABS_READ;
+
objfile->psymbol_cache = bcache_xmalloc ();
objfile->macro_cache = bcache_xmalloc ();
/* obstack_init also initializes the obstack so it is
@@ -3502,8 +3505,6 @@ reread_symbols (void)
wrap_here ("");
}
- objfile->flags &= ~OBJF_SYMTABS_READ;
-
/* We're done reading the symbol file; finish off complaints. */
clear_complaints (&symfile_complaints, 0, 1);
gdb-false-warning-gnu.liblist.patch:
symfile.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
--- NEW FILE gdb-false-warning-gnu.liblist.patch ---
http://sourceware.org/ml/gdb-patches/2010-02/msg00713.html
Subject: Re: [patch] Fix false warning: section .gnu.liblist not found in ... [rediffed]
Hi,
only a technical rediff.
------------------------------------------------------------------------------
On Sat, 13 Feb 2010 23:49:29 +0100, Jan Kratochvil wrote:
Hi,
post-7.0 GDB started to print many false warnings on prelink-ed system:
$ ./gdb -nx -ex r echo
...
Reading symbols from /bin/echo...Reading symbols from /usr/lib/debug/bin/echo.debug...
warning: section .gnu.liblist not found in /usr/lib/debug/bin/echo.debug
warning: section .gnu.conflict not found in /usr/lib/debug/bin/echo.debug
done.
done.
Starting program: /bin/echo
warning: section .gnu.liblist not found in /usr/lib/debug/bin/echo.debug
warning: section .gnu.conflict not found in /usr/lib/debug/bin/echo.debug
warning: section .gnu.liblist not found in /usr/lib/debug/bin/echo.debug
warning: section .gnu.conflict not found in /usr/lib/debug/bin/echo.debug
warning: section .gnu.liblist not found in /usr/lib/debug/bin/echo.debug
warning: section .gnu.conflict not found in /usr/lib/debug/bin/echo.debug
These sections are from prelink and they are not present in the *.debug files.
It is formally a regression by:
commit 3bfec189bb0fa1a2a44f1645dd68a9572e7a841c
2010-01-07 Tristan Gingold <gingold(a)adacore.com>
* symfile.c (build_section_addr_info_from_objfile): New function.
(symbol_file_add_separate): Don't use offsets from objfile but
built an addr info.
But I think would be unavoidable even for the unification of PIC+PIE handling.
Found no usable section flag differences for .gnu.liblist vs. for example
.text so used just the section name for the exception.
.gnu.liblist/.gnu.conflict related dumps:
executable:
Section Headers:
[Nr] Name Type Address Off Size ES Flg Lk Inf Al
[ 6] .gnu.liblist GNU_LIBLIST 00000000004006b8 0006b8 000028 14 A 28 0 4
[ 7] .gnu.conflict RELA 00000000004006e0 0006e0 0001c8 18 A 5 0 8
Program Headers:
Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align
LOAD 0x000000 0x0000000000400000 0x0000000000400000 0x005254 0x005254 R E 0x200000
Dynamic section at offset 0x52c8 contains 24 entries:
Tag Type Name/Value
0x000000006ffffef9 (GNU_LIBLIST) 0x4006b8
0x000000006ffffdf7 (GNU_LIBLISTSZ) 40 (bytes)
0x000000006ffffef8 (GNU_CONFLICT) 0x4006e0
0x000000006ffffdf6 (GNU_CONFLICTSZ) 456 (bytes)
library:
Section Headers:
[Nr] Name Type Address Off Size ES Flg Lk Inf Al
[74] .gnu.liblist GNU_LIBLIST 0000000000000000 249940 000014 14 75 0 4
No regressions on {x86_64,x86_64-m32,i686}-fedora12-linux-gnu.
Thanks,
Jan
2010-03-01 Jan Kratochvil <jan.kratochvil(a)redhat.com>
* symfile.c (addr_info_make_relative): New variable sect_name, use it.
Do not warn on ".gnu.liblist" and ".gnu.conflict".
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -597,7 +597,8 @@ addr_info_make_relative (struct section_addr_info *addrs, bfd *abfd)
for (i = 0; i < addrs->num_sections && addrs->other[i].name; i++)
{
- asection *sect = bfd_get_section_by_name (abfd, addrs->other[i].name);
+ const char *sect_name = addrs->other[i].name;
+ asection *sect = bfd_get_section_by_name (abfd, sect_name);
if (sect)
{
@@ -614,8 +615,16 @@ addr_info_make_relative (struct section_addr_info *addrs, bfd *abfd)
}
else
{
- warning (_("section %s not found in %s"), addrs->other[i].name,
- bfd_get_filename (abfd));
+ /* These two sections are intentionally loaded into memory from
+ the DYNAMIC segment and so they have both SEC_ALLOC and SEC_LOAD
+ set in the main executable (not in the library files). They
+ are not present in the separate debug info file, though. */
+
+ if (!(strcmp (sect_name, ".gnu.liblist") == 0
+ || strcmp (sect_name, ".gnu.conflict") == 0))
+ warning (_("section %s not found in %s"), sect_name,
+ bfd_get_filename (abfd));
+
addrs->other[i].addr = 0;
/* SECTINDEX is invalid if ADDR is zero. */
Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb.spec,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -p -r1.425 -r1.426
--- gdb.spec 26 Feb 2010 01:18:33 -0000 1.425
+++ gdb.spec 28 Feb 2010 23:28:44 -0000 1.426
@@ -36,7 +36,7 @@ Version: 7.0.1
# The release always contains a leading reserved number, start it at 1.
# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 32%{?_with_upstream:.upstream}%{dist}
+Release: 33%{?_with_upstream:.upstream}%{dist}
License: GPLv3+
Group: Development/Debuggers
@@ -468,6 +468,12 @@ Patch422: gdb-infcall-sp-underflow.patch
# Workaround ia64 inferior calls clearing SP.
Patch423: gdb-ia64-infcall-workaround.patch
+# [delayed-symfile] Backport fix of reread_symbols (Tom Tromey, BZ 562517).
+Patch424: gdb-bz562517-archer-reread-quick_addrmap.patch
+
+# Fix false warning: section .gnu.liblist not found in ...
+Patch425: gdb-false-warning-gnu.liblist.patch
+
BuildRequires: ncurses-devel%{?_isa} texinfo gettext flex bison expat-devel%{?_isa}
Requires: readline%{?_isa}
BuildRequires: readline-devel%{?_isa}
@@ -728,6 +734,8 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
%patch421 -p1
%patch422 -p1
%patch423 -p1
+%patch424 -p1
+%patch425 -p1
# Always verify their applicability.
%patch393 -p1
%patch335 -p1
@@ -1053,6 +1061,10 @@ fi
%endif
%changelog
+* Sun Feb 28 2010 Jan Kratochvil <jan.kratochvil(a)redhat.com> - 7.0.1-33.fc12
+- [delayed-symfile] Backport fix of reread_symbols (Tom Tromey, BZ 562517).
+- Fix false warning: section .gnu.liblist not found in ...
+
* Fri Feb 26 2010 Jan Kratochvil <jan.kratochvil(a)redhat.com> - 7.0.1-32.fc12
- Fix gdb.ada/* regressions (Keith Seitz).
- Disable addon (finish) due to inline-cmds.exp: up from outer_inline2 assert.
13Â years, 9Â months
rpms/rabbitmq-server/F-13 .cvsignore, 1.4, 1.5 rabbitmq-asroot-script-wrapper, 1.1, 1.2 rabbitmq-script-wrapper, 1.1, 1.2 rabbitmq-server.init, 1.2, 1.3 rabbitmq-server.spec, 1.5, 1.6 sources, 1.4, 1.5
by Hubert Plociniczak
Author: hubert
Update of /cvs/pkgs/rpms/rabbitmq-server/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10502
Modified Files:
.cvsignore rabbitmq-asroot-script-wrapper
rabbitmq-script-wrapper rabbitmq-server.init
rabbitmq-server.spec sources
Log Message:
New upstream release 1.7.2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rabbitmq-server/F-13/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 11 Nov 2009 00:42:02 -0000 1.4
+++ .cvsignore 28 Feb 2010 23:28:32 -0000 1.5
@@ -1 +1 @@
-rabbitmq-server-1.7.0.tar.gz
+rabbitmq-server-1.7.2.tar.gz
Index: rabbitmq-asroot-script-wrapper
===================================================================
RCS file: /cvs/pkgs/rpms/rabbitmq-server/F-13/rabbitmq-asroot-script-wrapper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rabbitmq-asroot-script-wrapper 11 Nov 2009 00:42:02 -0000 1.1
+++ rabbitmq-asroot-script-wrapper 28 Feb 2010 23:28:32 -0000 1.2
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
## The contents of this file are subject to the Mozilla Public License
## Version 1.1 (the "License"); you may not use this file except in
## compliance with the License. You may obtain a copy of the License at
@@ -19,35 +19,27 @@
## are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
## Technologies LLC, and Rabbit Technologies Ltd.
##
-## Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+## Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
## Ltd. Portions created by Cohesive Financial Technologies LLC are
-## Copyright (C) 2007-2009 Cohesive Financial Technologies
+## Copyright (C) 2007-2010 Cohesive Financial Technologies
## LLC. Portions created by Rabbit Technologies Ltd are Copyright
-## (C) 2007-2009 Rabbit Technologies Ltd.
+## (C) 2007-2010 Rabbit Technologies Ltd.
##
## All Rights Reserved.
##
## Contributor(s): ______________________________________.
##
-# Escape spaces and quotes, because shell is revolting.
-for arg in "$@" ; do
- # Escape quotes in parameters, so that they're passed through cleanly.
- arg=$(sed -e 's/"/\\"/g' <<-END
- $arg
- END
- )
- CMDLINE="${CMDLINE} \"${arg}\""
-done
-
cd /var/lib/rabbitmq
SCRIPT=`basename $0`
if [ `id -u` = 0 ] ; then
- /usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}
+ /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
else
- echo -e "\nOnly root should run ${SCRIPT}\n"
+ echo
+ echo "Only root should run ${SCRIPT}"
+ echo
exit 1
fi
Index: rabbitmq-script-wrapper
===================================================================
RCS file: /cvs/pkgs/rpms/rabbitmq-server/F-13/rabbitmq-script-wrapper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rabbitmq-script-wrapper 26 May 2009 10:47:06 -0000 1.1
+++ rabbitmq-script-wrapper 28 Feb 2010 23:28:32 -0000 1.2
@@ -1,8 +1,39 @@
-#!/bin/bash
+#!/bin/sh
+## The contents of this file are subject to the Mozilla Public License
+## Version 1.1 (the "License"); you may not use this file except in
+## compliance with the License. You may obtain a copy of the License at
+## http://www.mozilla.org/MPL/
+##
+## Software distributed under the License is distributed on an "AS IS"
+## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+## License for the specific language governing rights and limitations
+## under the License.
+##
+## The Original Code is RabbitMQ.
+##
+## The Initial Developers of the Original Code are LShift Ltd,
+## Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
+##
+## Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
+## Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
+## are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
+## Technologies LLC, and Rabbit Technologies Ltd.
+##
+## Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
+## Ltd. Portions created by Cohesive Financial Technologies LLC are
+## Copyright (C) 2007-2010 Cohesive Financial Technologies
+## LLC. Portions created by Rabbit Technologies Ltd are Copyright
+## (C) 2007-2010 Rabbit Technologies Ltd.
+##
+## All Rights Reserved.
+##
+## Contributor(s): ______________________________________.
+##
+
# Escape spaces and quotes, because shell is revolting.
for arg in "$@" ; do
# Escape quotes in parameters, so that they're passed through cleanly.
- arg=$(sed -e 's/"/\\"/' <<-END
+ arg=$(sed -e 's/"/\\"/g' <<-END
$arg
END
)
@@ -15,9 +46,13 @@ SCRIPT=`basename $0`
if [ `id -u` = 0 ] ; then
su rabbitmq -s /bin/sh -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
+elif [ `id -u` = `id -u rabbitmq` ] ; then
+ /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
else
/usr/lib/rabbitmq/bin/${SCRIPT}
- echo -e "\nOnly root should run ${SCRIPT}\n"
+ echo
+ echo "Only root or rabbitmq should run ${SCRIPT}"
+ echo
exit 1
fi
Index: rabbitmq-server.init
===================================================================
RCS file: /cvs/pkgs/rpms/rabbitmq-server/F-13/rabbitmq-server.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rabbitmq-server.init 11 Nov 2009 00:42:02 -0000 1.2
+++ rabbitmq-server.init 28 Feb 2010 23:28:32 -0000 1.3
@@ -66,8 +66,6 @@ stop_rabbitmq () {
$DAEMON stop_all > ${INIT_LOG_DIR}/shutdown_log 2> ${INIT_LOG_DIR}/shutdown_err
RETVAL=$?
if [ $RETVAL = 0 ] ; then
- # Try to stop epmd if run by the rabbitmq user
- pkill -u rabbitmq epmd || :
[ -n "$LOCK_FILE" ] && rm -rf $LOCK_FILE
else
echo FAILED - check ${INIT_LOG_DIR}/shutdown_log, _err
Index: rabbitmq-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rabbitmq-server/F-13/rabbitmq-server.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rabbitmq-server.spec 11 Nov 2009 00:42:02 -0000 1.5
+++ rabbitmq-server.spec 28 Feb 2010 23:28:32 -0000 1.6
@@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: rabbitmq-server
-Version: 1.7.0
+Version: 1.7.2
Release: 1%{?dist}
License: MPLv1.1
Group: Development/Libraries
@@ -75,9 +75,8 @@ echo '%defattr(-,root,root, -)' >> %{_bu
%pre
if [ $1 -gt 1 ]; then
- #Upgrade - stop and remove previous instance of rabbitmq-server init.d script
+ # Upgrade - stop previous instance of rabbitmq-server init.d script
/sbin/service rabbitmq-server stop
- /sbin/chkconfig --del rabbitmq-server
fi
# create rabbitmq group
@@ -119,6 +118,12 @@ fi
rm -rf %{buildroot}
%changelog
+* Mon Feb 15 2010 Matthew Sackman <matthew(a)lshift.net> 1.7.2-1
+- New Upstream Release
+
+* Fri Jan 22 2010 Matthew Sackman <matthew(a)lshift.net> 1.7.1-1
+- New Upstream Release
+
* Mon Oct 5 2009 David Wragg <dpw(a)lshift.net> 1.7.0-1
- New upstream release
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rabbitmq-server/F-13/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 11 Nov 2009 00:42:02 -0000 1.4
+++ sources 28 Feb 2010 23:28:32 -0000 1.5
@@ -1 +1 @@
-4505ca0fd8718439bd6f5e2af2379e56 rabbitmq-server-1.7.0.tar.gz
+fb83be3b1577cdd54459012b85b7631d rabbitmq-server-1.7.2.tar.gz
13Â years, 9Â months
rpms/octave/F-13 octave.spec,1.97,1.98
by alexlan
Author: alexlan
Update of /cvs/pkgs/rpms/octave/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9361
Modified Files:
octave.spec
Log Message:
* Fri Feb 26 2010 Michal Schmidt <mschmidt(a)redhat.com> 6:3.2.4-2
- Fix the prelink workaround to work with any version.
- Use _sysconfdir macro instead of /etc.
Index: octave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave/F-13/octave.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- octave.spec 28 Jan 2010 13:06:39 -0000 1.97
+++ octave.spec 28 Feb 2010 23:15:19 -0000 1.98
@@ -3,13 +3,12 @@
Name: octave
Version: 3.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A high-level language for numerical computations
Epoch: 6
Group: Applications/Engineering
License: GPLv3+
Source0: ftp://ftp.octave.org/pub/octave/octave-%{version}.tar.bz2
-Source1: octave.conf
URL: http://www.octave.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -95,8 +94,8 @@ make install DESTDIR=%{buildroot}
rm -f %{buildroot}%{_infodir}/dir
# Make library links
-mkdir -p %{buildroot}/etc/ld.so.conf.d
-echo "%{_libdir}/octave-%{version}" > %{buildroot}/etc/ld.so.conf.d/octave-%{_arch}.conf
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
+echo "%{_libdir}/octave-%{version}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/octave-%{_arch}.conf
# Remove RPM_BUILD_ROOT from ls-R files
perl -pi -e "s,%{buildroot},," %{buildroot}%{_libexecdir}/%{name}/ls-R
@@ -129,7 +128,7 @@ cp -a doc/interpreter/*.pdf doc/interpre
# work-around broken pre-linking (bug 524493)
install -d %{buildroot}%{_sysconfdir}/prelink.conf.d
-install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/prelink.conf.d/
+echo "-b %{_bindir}/octave-%{version}" > %{buildroot}%{_sysconfdir}/prelink.conf.d/octave.conf
%check
make check
@@ -154,7 +153,7 @@ fi
%doc COPYING NEWS* PROJECTS README README.Linux README.kpathsea ROADMAP
%doc SENDING-PATCHES emacs/
# FIXME: Create an -emacs package that has the emacs addon
-%config /etc/ld.so.conf.d/octave-*.conf
+%config %{_sysconfdir}/ld.so.conf.d/octave-*.conf
%{_bindir}/octave*
%{_libdir}/octave-%{version}/
%{_libexecdir}/octave/
@@ -185,6 +184,10 @@ fi
%changelog
+* Fri Feb 26 2010 Michal Schmidt <mschmidt(a)redhat.com> 6:3.2.4-2
+- Fix the prelink workaround to work with any version.
+- Use _sysconfdir macro instead of /etc.
+
* Thu Jan 28 2010 Jussi Lehtola <jussilehtola(a)fedoraproject.org> - 6:3.2.4-1
- Update to 3.2.4 with a few rpmlint fixes.
13Â years, 9Â months
rpms/octave/devel octave.spec,1.97,1.98
by alexlan
Author: alexlan
Update of /cvs/pkgs/rpms/octave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8766
Modified Files:
octave.spec
Log Message:
* Fri Feb 26 2010 Michal Schmidt <mschmidt(a)redhat.com> 6:3.2.4-2
- Fix the prelink workaround to work with any version.
- Use _sysconfdir macro instead of /etc.
Index: octave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/octave.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- octave.spec 28 Jan 2010 13:06:39 -0000 1.97
+++ octave.spec 28 Feb 2010 23:08:24 -0000 1.98
@@ -3,13 +3,12 @@
Name: octave
Version: 3.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A high-level language for numerical computations
Epoch: 6
Group: Applications/Engineering
License: GPLv3+
Source0: ftp://ftp.octave.org/pub/octave/octave-%{version}.tar.bz2
-Source1: octave.conf
URL: http://www.octave.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -95,8 +94,8 @@ make install DESTDIR=%{buildroot}
rm -f %{buildroot}%{_infodir}/dir
# Make library links
-mkdir -p %{buildroot}/etc/ld.so.conf.d
-echo "%{_libdir}/octave-%{version}" > %{buildroot}/etc/ld.so.conf.d/octave-%{_arch}.conf
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
+echo "%{_libdir}/octave-%{version}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/octave-%{_arch}.conf
# Remove RPM_BUILD_ROOT from ls-R files
perl -pi -e "s,%{buildroot},," %{buildroot}%{_libexecdir}/%{name}/ls-R
@@ -129,7 +128,7 @@ cp -a doc/interpreter/*.pdf doc/interpre
# work-around broken pre-linking (bug 524493)
install -d %{buildroot}%{_sysconfdir}/prelink.conf.d
-install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/prelink.conf.d/
+echo "-b %{_bindir}/octave-%{version}" > %{buildroot}%{_sysconfdir}/prelink.conf.d/octave.conf
%check
make check
@@ -154,7 +153,7 @@ fi
%doc COPYING NEWS* PROJECTS README README.Linux README.kpathsea ROADMAP
%doc SENDING-PATCHES emacs/
# FIXME: Create an -emacs package that has the emacs addon
-%config /etc/ld.so.conf.d/octave-*.conf
+%config %{_sysconfdir}/ld.so.conf.d/octave-*.conf
%{_bindir}/octave*
%{_libdir}/octave-%{version}/
%{_libexecdir}/octave/
@@ -185,6 +184,10 @@ fi
%changelog
+* Fri Feb 26 2010 Michal Schmidt <mschmidt(a)redhat.com> 6:3.2.4-2
+- Fix the prelink workaround to work with any version.
+- Use _sysconfdir macro instead of /etc.
+
* Thu Jan 28 2010 Jussi Lehtola <jussilehtola(a)fedoraproject.org> - 6:3.2.4-1
- Update to 3.2.4 with a few rpmlint fixes.
13Â years, 9Â months
rpms/openal-soft/devel openal-soft.spec,1.20,1.21
by Thomas Kowaliczek
Author: linuxdonald
Update of /cvs/pkgs/rpms/openal-soft/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7406/devel
Modified Files:
openal-soft.spec
Log Message:
Fixed Bug 567870
Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/devel/openal-soft.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- openal-soft.spec 28 Feb 2010 22:48:23 -0000 1.20
+++ openal-soft.spec 28 Feb 2010 22:57:04 -0000 1.21
@@ -43,7 +43,7 @@ The %{name}-devel package contains libra
developing applications that use %{name}.
%prep
-%setup -q
+%setup-q -n openal-soft
%patch1 -p0 -b .orig
%build
13Â years, 9Â months
rpms/openal-soft/F-13 openal-soft.spec,1.20,1.21
by Thomas Kowaliczek
Author: linuxdonald
Update of /cvs/pkgs/rpms/openal-soft/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7406/F-13
Modified Files:
openal-soft.spec
Log Message:
Fixed Bug 567870
Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-13/openal-soft.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- openal-soft.spec 28 Feb 2010 22:48:23 -0000 1.20
+++ openal-soft.spec 28 Feb 2010 22:57:04 -0000 1.21
@@ -43,7 +43,7 @@ The %{name}-devel package contains libra
developing applications that use %{name}.
%prep
-%setup -q
+%setup-q -n openal-soft
%patch1 -p0 -b .orig
%build
13Â years, 9Â months
rpms/openal-soft/F-12 openal-soft.spec,1.20,1.21
by Thomas Kowaliczek
Author: linuxdonald
Update of /cvs/pkgs/rpms/openal-soft/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7350
Modified Files:
openal-soft.spec
Log Message:
Fixed Bug 567870
Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-12/openal-soft.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- openal-soft.spec 28 Feb 2010 22:48:23 -0000 1.20
+++ openal-soft.spec 28 Feb 2010 22:56:36 -0000 1.21
@@ -43,7 +43,7 @@ The %{name}-devel package contains libra
developing applications that use %{name}.
%prep
-%setup -q
+%setup-q -n openal-soft
%patch1 -p0 -b .orig
%build
13Â years, 9Â months