diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/glibc/glibc-2.13-dlclose-search-reset.patch | 196 | ||||
-rw-r--r-- | core/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch | 26 | ||||
-rw-r--r-- | core/pcre/r661.diff | 26 | ||||
-rw-r--r-- | core/udev/bluetooth.patch | 36 | ||||
-rw-r--r-- | core/util-linux/agetty-typo.patch | 27 | ||||
-rw-r--r-- | core/util-linux/dmesg-non-printk.patch | 69 | ||||
-rw-r--r-- | core/util-linux/dmesg-space.patch | 31 | ||||
-rw-r--r-- | core/util-linux/dont-close-0.patch | 32 | ||||
-rw-r--r-- | core/util-linux/fix-remount.patch | 37 | ||||
-rw-r--r-- | core/util-linux/write-freopen.patch | 27 |
10 files changed, 0 insertions, 507 deletions
diff --git a/core/glibc/glibc-2.13-dlclose-search-reset.patch b/core/glibc/glibc-2.13-dlclose-search-reset.patch deleted file mode 100644 index 3ad8b418a..000000000 --- a/core/glibc/glibc-2.13-dlclose-search-reset.patch +++ /dev/null @@ -1,196 +0,0 @@ -From 2f811bf88bed4a6c0dec8778847ba441736d509d Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Wed, 26 May 2010 18:28:59 +0200 -Subject: [PATCH] Fix scope handling during dl_close - ---- - ChangeLog | 12 ++++++++++++ - elf/Makefile | 10 +++++++++- - elf/dl-close.c | 7 +++++++ - elf/unload8.c | 33 +++++++++++++++++++++++++++++++++ - elf/unload8mod1.c | 7 +++++++ - elf/unload8mod1x.c | 1 + - elf/unload8mod2.c | 7 +++++++ - elf/unload8mod3.c | 27 +++++++++++++++++++++++++++ - 8 files changed, 103 insertions(+), 1 deletions(-) - create mode 100644 elf/unload8.c - create mode 100644 elf/unload8mod1.c - create mode 100644 elf/unload8mod1x.c - create mode 100644 elf/unload8mod2.c - create mode 100644 elf/unload8mod3.c - -diff --git a/elf/Makefile b/elf/Makefile -index 59e835f..65b6deb 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -89,6 +89,7 @@ distribute := rtld-Rules \ - unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ - unload6mod1.c unload6mod2.c unload6mod3.c \ - unload7mod1.c unload7mod2.c \ -+ unload8mod1.c unload8mod1x.c unload8mod2.c unload8mod3.c \ - tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \ - tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \ - tst-auditmod4a.c tst-auditmod4b.c \ -@@ -196,7 +197,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ - tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \ - tst-dlmodcount tst-dlopenrpath tst-deep1 \ - tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \ -- unload3 unload4 unload5 unload6 unload7 tst-global1 order2 \ -+ unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \ - tst-audit1 tst-audit2 \ - tst-stackguard1 tst-addr1 tst-thrlock \ - tst-unique1 tst-unique2 -@@ -247,6 +248,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ - unload4mod1 unload4mod2 unload4mod3 unload4mod4 \ - unload6mod1 unload6mod2 unload6mod3 \ - unload7mod1 unload7mod2 \ -+ unload8mod1 unload8mod1x unload8mod2 unload8mod3 \ - order2mod1 order2mod2 order2mod3 order2mod4 \ - tst-unique1mod1 tst-unique1mod2 \ - tst-unique2mod1 tst-unique2mod2 -@@ -522,6 +524,9 @@ $(objpfx)unload6mod2.so: $(libdl) - $(objpfx)unload6mod3.so: $(libdl) - $(objpfx)unload7mod1.so: $(libdl) - $(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so -+$(objpfx)unload8mod1.so: $(objpfx)unload8mod2.so -+$(objpfx)unload8mod2.so: $(objpfx)unload8mod3.so -+$(objpfx)unload8mod3.so: $(libdl) - $(objpfx)tst-initordera2.so: $(objpfx)tst-initordera1.so - $(objpfx)tst-initorderb2.so: $(objpfx)tst-initorderb1.so $(objpfx)tst-initordera2.so - $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb1.so -@@ -823,6 +828,9 @@ $(objpfx)unload7: $(libdl) - $(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so - unload7-ENV = MALLOC_PERTURB_=85 - -+$(objpfx)unload8: $(libdl) -+$(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so -+ - ifdef libdl - $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a - $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so -diff --git a/elf/dl-close.c b/elf/dl-close.c -index 700e765..f47d5f8 100644 ---- a/elf/dl-close.c -+++ b/elf/dl-close.c -@@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map) - - imap->l_scope_max = new_size; - } -+ else if (new_list != NULL) -+ { -+ /* We didn't change the scope array, so reset the search -+ list. */ -+ imap->l_searchlist.r_list = NULL; -+ imap->l_searchlist.r_nlist = 0; -+ } - - /* The loader is gone, so mark the object as not having one. - Note: l_idx != IDX_STILL_USED -> object will be removed. */ -diff --git a/elf/unload8.c b/elf/unload8.c -new file mode 100644 -index 0000000..f984a38 ---- /dev/null -+++ b/elf/unload8.c -@@ -0,0 +1,33 @@ -+#include <dlfcn.h> -+#include <stdio.h> -+ -+int -+main (void) -+{ -+ void *h = dlopen ("$ORIGIN/unload8mod1.so", RTLD_LAZY); -+ if (h == NULL) -+ { -+ puts ("dlopen unload8mod1.so failed"); -+ return 1; -+ } -+ -+ void *h2 = dlopen ("$ORIGIN/unload8mod1x.so", RTLD_LAZY); -+ if (h2 == NULL) -+ { -+ puts ("dlopen unload8mod1x.so failed"); -+ return 1; -+ } -+ dlclose (h2); -+ -+ int (*mod1) (void) = dlsym (h, "mod1"); -+ if (mod1 == NULL) -+ { -+ puts ("dlsym failed"); -+ return 1; -+ } -+ -+ mod1 (); -+ dlclose (h); -+ -+ return 0; -+} -diff --git a/elf/unload8mod1.c b/elf/unload8mod1.c -new file mode 100644 -index 0000000..fe7e81c ---- /dev/null -+++ b/elf/unload8mod1.c -@@ -0,0 +1,7 @@ -+extern void mod2 (void); -+ -+void -+mod1 (void) -+{ -+ mod2 (); -+} -diff --git a/elf/unload8mod1x.c b/elf/unload8mod1x.c -new file mode 100644 -index 0000000..835b634 ---- /dev/null -+++ b/elf/unload8mod1x.c -@@ -0,0 +1 @@ -+int mod1x; -diff --git a/elf/unload8mod2.c b/elf/unload8mod2.c -new file mode 100644 -index 0000000..2fd8b67 ---- /dev/null -+++ b/elf/unload8mod2.c -@@ -0,0 +1,7 @@ -+extern void mod3 (void); -+ -+void -+mod2 (void) -+{ -+ mod3 (); -+} -diff --git a/elf/unload8mod3.c b/elf/unload8mod3.c -new file mode 100644 -index 0000000..d49e22b ---- /dev/null -+++ b/elf/unload8mod3.c -@@ -0,0 +1,27 @@ -+#include <dlfcn.h> -+#include <stdio.h> -+#include <stdlib.h> -+ -+void -+mod3_fini2 (void) -+{ -+} -+ -+void -+mod3_fini (void) -+{ -+ mod3_fini2 (); -+} -+ -+void -+mod3 (void) -+{ -+ void *h = dlopen ("$ORIGIN/unload8mod2.so", RTLD_LAZY); -+ if (h == NULL) -+ { -+ puts ("dlopen unload8mod2.so failed"); -+ exit (1); -+ } -+ -+ atexit (mod3_fini); -+} --- -1.7.3.4 - diff --git a/core/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch b/core/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch deleted file mode 100644 index ef91116e5..000000000 --- a/core/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 032c0ee3ee28841d684950e33a77210118697566 Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Thu, 1 Sep 2011 10:46:14 +0200 -Subject: [PATCH] Avoid assertion failure when first DNS answer was empty - ---- - ChangeLog | 4 ++++ - resolv/res_query.c | 2 +- - 2 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/resolv/res_query.c b/resolv/res_query.c -index 2f7cfaa..2ded9fb 100644 ---- a/resolv/res_query.c -+++ b/resolv/res_query.c -@@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp, - && *resplen2 > (int) sizeof (HEADER)) - { - /* Special case of partial answer. */ -- assert (hp != hp2); -+ assert (n == 0 || hp != hp2); - hp = hp2; - } - else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) --- -1.7.3.4 - diff --git a/core/pcre/r661.diff b/core/pcre/r661.diff deleted file mode 100644 index 7bed4ce2e..000000000 --- a/core/pcre/r661.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- code/trunk/pcre_compile.c 2011/08/02 11:00:40 654 -+++ code/trunk/pcre_compile.c 2011/08/21 09:00:54 661 -@@ -2295,8 +2295,13 @@ - A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not. - It seems that the appearance of a nested POSIX class supersedes an apparent - external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or --a digit. Also, unescaped square brackets may also appear as part of class --names. For example, [:a[:abc]b:] gives unknown class "[:abc]b:]"in Perl. -+a digit. -+ -+In Perl, unescaped square brackets may also appear as part of class names. For -+example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for -+[:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not -+seem right at all. PCRE does not allow closing square brackets in POSIX class -+names. - - Arguments: - ptr pointer to the initial [ -@@ -2314,6 +2319,7 @@ - { - if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) - ptr++; -+ else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE; - else - { - if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) diff --git a/core/udev/bluetooth.patch b/core/udev/bluetooth.patch deleted file mode 100644 index 96f5d6901..000000000 --- a/core/udev/bluetooth.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7462d61442f606cc118722e0572ac8db48fa2540 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org> -Date: Tue, 2 Aug 2011 10:56:33 +0200 -Subject: [PATCH] rules: input - fix detection of bluetooth hid devices in - Xorg - -Commit c49df20758e0f22778cfc93b598f2929f4c86272 prevented udev from -creating broken symlinks for bluetooth hid devices. Unfortunately, -it also removed the ID_INPUT=1 and ID_INPUT_{KEY,MOUSE}=1 properties -from those devices. Xorg relies on these properties for cold- and -hotplugging of input devices. - -With this patch, udev still omits the broken symlinks, but also -imports the input_id properties again. ---- - rules/rules.d/60-persistent-input.rules | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/rules/rules.d/60-persistent-input.rules b/rules/rules.d/60-persistent-input.rules -index 65a6381..28d50d2 100644 ---- a/rules/rules.d/60-persistent-input.rules -+++ b/rules/rules.d/60-persistent-input.rules -@@ -2,9 +2,9 @@ - - ACTION=="remove", GOTO="persistent_input_end" - SUBSYSTEM!="input", GOTO="persistent_input_end" --SUBSYSTEMS=="bluetooth", GOTO="persistent_input_end" - - ENV{ID_INPUT}=="", IMPORT{program}="input_id %p" -+SUBSYSTEMS=="bluetooth", GOTO="persistent_input_end" - SUBSYSTEMS=="usb", ENV{ID_BUS}=="", IMPORT{program}="usb_id --export %p" - - # determine class name for persistent symlinks --- -1.7.6 - diff --git a/core/util-linux/agetty-typo.patch b/core/util-linux/agetty-typo.patch deleted file mode 100644 index a333d6280..000000000 --- a/core/util-linux/agetty-typo.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 89aed1c950376d828e1e0ddef94909a028e0517d Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Wed, 7 Sep 2011 07:37:03 +0200 -Subject: [PATCH] agetty: double equals sign typo in opentty() - -Reported-by: Francesco Cosoleto <cosoleto@gmail.com> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - term-utils/agetty.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/term-utils/agetty.c b/term-utils/agetty.c -index 733be38..35bb389 100644 ---- a/term-utils/agetty.c -+++ b/term-utils/agetty.c -@@ -985,7 +985,7 @@ static void open_tty(char *tty, struct termios *tp, struct options *op) - * In case of a virtual console the ioctl TIOCMGET fails and - * the error number will be set to EINVAL. - */ -- if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno = EINVAL)) { -+ if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno == EINVAL)) { - op->flags |= F_VCONSOLE; - if (!op->term) - op->term = DEFAULT_VCTERM; --- -1.7.6.1 - diff --git a/core/util-linux/dmesg-non-printk.patch b/core/util-linux/dmesg-non-printk.patch deleted file mode 100644 index ea2354420..000000000 --- a/core/util-linux/dmesg-non-printk.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 22f69825778f992ff98ed100252bf5e00a15d9d1 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Wed, 31 Aug 2011 12:28:39 +0200 -Subject: [PATCH] dmesg: fix for non-CONFIG_PRINTK_TIME kernels - - * dmesg(1) incorrectly assumes that lines like "<6>\n" - are broken. - - * it's more robust to assume the end of the record is "\n<" - - * print \n for empty lines - -Reported-by: "Gabor Z. Papp" <gzp@papp.hu> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - sys-utils/dmesg.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c -index 6090f4e..8e7bb4b 100644 ---- a/sys-utils/dmesg.c -+++ b/sys-utils/dmesg.c -@@ -442,12 +442,12 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) - - if (!begin) - begin = p; -- if (*p == '\n') -- end = p; - if (i + 1 == rec->next_size) { - end = p + 1; - i++; -- } -+ } else if (*p == '\n' && *(p + 1) == '<') -+ end = p; -+ - if (begin && !*begin) - begin = NULL; /* zero(s) at the end of the buffer? */ - if (!begin || !end) -@@ -469,9 +469,6 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) - } - } - -- if (end <= begin) -- return -1; /* error */ -- - if (*begin == '[' && (*(begin + 1) == ' ' || - isdigit(*(begin + 1)))) { - if (ctl->delta || ctl->ctime) { -@@ -534,12 +531,15 @@ static void print_buffer(const char *buf, size_t size, - } - - while (get_next_record(ctl, &rec) == 0) { -- if (!rec.mesg_size) -- continue; - - if (!accept_record(ctl, &rec)) - continue; - -+ if (!rec.mesg_size) { -+ putchar('\n'); -+ continue; -+ } -+ - if (ctl->decode && rec.level >= 0 && rec.facility >= 0) - printf("%-6s:%-6s: ", facility_names[rec.facility].name, - level_names[rec.level].name); --- -1.7.6.1 - diff --git a/core/util-linux/dmesg-space.patch b/core/util-linux/dmesg-space.patch deleted file mode 100644 index 2038888cc..000000000 --- a/core/util-linux/dmesg-space.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 31c9099a81d3a9c70fdceb198eebed678173d954 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Fri, 2 Sep 2011 14:42:04 +0200 -Subject: [PATCH] dmesg: remove extra space only after time stamp - -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - sys-utils/dmesg.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c -index 8e7bb4b..b3713a0 100644 ---- a/sys-utils/dmesg.c -+++ b/sys-utils/dmesg.c -@@ -480,11 +480,10 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) - break; - } - } -+ if (begin < end && *begin == ' ') -+ begin++; - } - -- if (begin < end && *begin == ' ') -- begin++; -- - rec->mesg = begin; - rec->mesg_size = end - begin; - --- -1.7.6.1 - diff --git a/core/util-linux/dont-close-0.patch b/core/util-linux/dont-close-0.patch deleted file mode 100644 index 75cfc5c5e..000000000 --- a/core/util-linux/dont-close-0.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3a18db62e661fbb307ad3a53c18afabc92d3c63e Mon Sep 17 00:00:00 2001 -From: Petr Uzel <petr.uzel@suse.cz> -Date: Tue, 13 Sep 2011 11:08:46 +0200 -Subject: [PATCH 1/2] lib: do not attempt to close(0) in sysfs_deinit() - -If the 'open' fails we 'goto err' which runs 'sysfs_deinit()' on a 'cxt' -which hasn't been fully initialised. The 'dir_fd' is still 0, so -sysfs_deinit calls "close(0)". - -Addresses: https://bugzilla.novell.com/show_bug.cgi?id=714151 -Reported-by: Diego Ercolani <diego.ercolani@gmail.com> -Analysed-by: Neil Brown <nfbrown@suse.com> -Signed-off-by: Petr Uzel <petr.uzel@suse.cz> ---- - lib/sysfs.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/lib/sysfs.c b/lib/sysfs.c -index eec1f24..ebb3bb5 100644 ---- a/lib/sysfs.c -+++ b/lib/sysfs.c -@@ -140,6 +140,7 @@ int sysfs_init(struct sysfs_cxt *cxt, dev_t devno, struct sysfs_cxt *parent) - int fd, rc = 0; - - memset(cxt, 0, sizeof(*cxt)); -+ cxt->dir_fd = -1; - - if (!sysfs_devno_path(devno, path, sizeof(path))) - goto err; --- -1.7.6.1 - diff --git a/core/util-linux/fix-remount.patch b/core/util-linux/fix-remount.patch deleted file mode 100644 index 67149ab46..000000000 --- a/core/util-linux/fix-remount.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 277a6dd53569a409e05316a7bdaed0e78e326762 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Tue, 13 Sep 2011 22:59:39 +0200 -Subject: [PATCH 2/2] mount: check for target before source on remount - -Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=737091 -Reported-by: Eric Paris <eparis@redhat.com> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - mount/fstab.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/mount/fstab.c b/mount/fstab.c -index 8d88f68..77bf81c 100644 ---- a/mount/fstab.c -+++ b/mount/fstab.c -@@ -272,10 +272,15 @@ getmntfilebackward (const char *name, struct mntentchn *mcprev) { - mc0 = mtab_head(); - if (!mcprev) - mcprev = mc0; -+ - for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev) -- if (streq(mc->m.mnt_dir, name) || -- streq(mc->m.mnt_fsname, name)) -+ if (streq(mc->m.mnt_dir, name)) - return mc; -+ -+ for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev) -+ if (streq(mc->m.mnt_fsname, name)) -+ return mc; -+ - return NULL; - } - --- -1.7.6.1 - diff --git a/core/util-linux/write-freopen.patch b/core/util-linux/write-freopen.patch deleted file mode 100644 index a2014a107..000000000 --- a/core/util-linux/write-freopen.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b89fdd9c05a6e5f12ab56441389e5ee9d1d7f30f Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Tue, 6 Sep 2011 03:18:46 +0200 -Subject: [PATCH] write: fix path for freopen() - -Reported-by: xinglp <xinglp@gmail.com> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - term-utils/write.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/term-utils/write.c b/term-utils/write.c -index a825f62..a70eb7b 100644 ---- a/term-utils/write.c -+++ b/term-utils/write.c -@@ -322,7 +322,7 @@ void do_write(char *tty, char *mytty, uid_t myuid) - - if (strlen(tty) + 6 > sizeof(path)) - errx(EXIT_FAILURE, _("tty path %s too long"), tty); -- printf(path, "/dev/%s", tty); -+ snprintf(path, sizeof(path), "/dev/%s", tty); - if ((freopen(path, "w", stdout)) == NULL) - err(EXIT_FAILURE, "%s", path); - --- -1.7.6.1 - |