diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/patch/patch-2.5.9/global-reject-file.diff | 201 | ||||
| -rw-r--r-- | packages/patch/patch-2.5.9/unified-reject-files.diff | 305 | ||||
| -rw-r--r-- | packages/patch/patch_2.5.9.bb | 5 | ||||
| -rw-r--r-- | packages/qemu/files/arm_nptl.patch | 86 | ||||
| -rw-r--r-- | packages/qemu/qemu_cvs.bb | 4 | ||||
| -rw-r--r-- | packages/syslog-ng/files/syslog-ng.conf | 89 | ||||
| -rw-r--r-- | packages/syslog-ng/syslog-ng_1.6.8.bb | 5 |
7 files changed, 646 insertions, 49 deletions
diff --git a/packages/patch/patch-2.5.9/global-reject-file.diff b/packages/patch/patch-2.5.9/global-reject-file.diff new file mode 100644 index 0000000000..66065fcbf5 --- /dev/null +++ b/packages/patch/patch-2.5.9/global-reject-file.diff @@ -0,0 +1,201 @@ +Index: patch-2.5.9/patch.man +=================================================================== +--- patch-2.5.9.orig/patch.man ++++ patch-2.5.9/patch.man +@@ -520,6 +520,15 @@ file. + \fB\*=reject\-unified\fP + Produce unified reject files. The default is to produce context type reject files. + .TP ++.BI \*=global\-reject\-file= rejectfile ++Put all rejects into ++.I rejectfile ++instead of creating separate reject files for all files that have rejects. The ++.I rejectfile ++will contain headers that identify which file each reject refers to. Note that ++the global reject file is created even if \-\-dry\-run is specified (while ++non-global reject files will only be created without \-\-dry\-run). ++.TP + \fB\-R\fP or \fB\*=reverse\fP + Assume that this patch was created with the old and new files swapped. + (Yes, I'm afraid that does happen occasionally, human nature being what it +Index: patch-2.5.9/patch.c +=================================================================== +--- patch-2.5.9.orig/patch.c ++++ patch-2.5.9/patch.c +@@ -67,6 +67,7 @@ static bool similar (char const *, size_ + static bool spew_output (struct outstate *); + static char const *make_temp (char); + static int numeric_string (char const *, bool, char const *); ++static void reject_header (const char *filename); + static void abort_hunk (void); + static void cleanup (void); + static void get_some_switches (void); +@@ -98,6 +99,7 @@ static int Argc; + static char * const *Argv; + + static FILE *rejfp; /* reject file pointer */ ++static char *global_reject; + + static char const *patchname; + static char *rejname; +@@ -172,6 +174,10 @@ main (int argc, char **argv) + /* Make sure we clean up in case of disaster. */ + set_signals (false); + ++ /* initialize global reject file */ ++ if (global_reject) ++ init_reject (); ++ + for ( + open_patch_file (patchname); + there_is_another_patch(); +@@ -208,8 +214,9 @@ main (int argc, char **argv) + init_output (TMPOUTNAME, exclusive, &outstate); + } + +- /* initialize reject file */ +- init_reject (); ++ /* initialize per-patch reject file */ ++ if (!global_reject) ++ init_reject (); + + /* find out where all the lines are */ + if (!skip_rest_of_patch) +@@ -278,6 +285,8 @@ main (int argc, char **argv) + + newwhere = pch_newfirst() + last_offset; + if (skip_rest_of_patch) { ++ if (!failed) ++ reject_header(outname); + abort_hunk(); + failed++; + if (verbosity == VERBOSE) +@@ -292,6 +301,8 @@ main (int argc, char **argv) + say ("Patch attempted to create file %s, which already exists.\n", + quotearg (inname)); + ++ if (!failed) ++ reject_header(outname); + abort_hunk(); + failed++; + if (verbosity != SILENT) +@@ -299,6 +310,8 @@ main (int argc, char **argv) + format_linenum (numbuf, newwhere)); + } + else if (! apply_hunk (&outstate, where)) { ++ if (!failed) ++ reject_header(outname); + abort_hunk (); + failed++; + if (verbosity != SILENT) +@@ -332,7 +345,8 @@ main (int argc, char **argv) + fclose (outstate.ofp); + outstate.ofp = 0; + } +- fclose (rejfp); ++ if (!global_reject) ++ fclose (rejfp); + continue; + } + +@@ -412,13 +426,13 @@ main (int argc, char **argv) + } + } + if (diff_type != ED_DIFF) { +- if (fclose (rejfp) != 0) ++ if (!global_reject && fclose (rejfp) != 0) + write_fatal (); + if (failed) { + somefailed = true; + say ("%d out of %d hunk%s %s", failed, hunk, "s" + (hunk == 1), + skip_rest_of_patch ? "ignored" : "FAILED"); +- if (outname) { ++ if (!global_reject && outname) { + char *rej = rejname; + if (!rejname) { + rej = xmalloc (strlen (outname) + 5); +@@ -445,6 +459,20 @@ main (int argc, char **argv) + } + set_signals (true); + } ++ if (global_reject) ++ { ++ if (fclose (rejfp) != 0) ++ write_fatal (); ++ if (somefailed) ++ { ++ say (" -- saving rejects to file %s\n", quotearg (global_reject)); ++ /*if (! dry_run) ++ {*/ ++ move_file (TMPREJNAME, &TMPREJNAME_needs_removal, ++ global_reject, 0644, false); ++ /*}*/ ++ } ++ } + if (outstate.ofp && (ferror (outstate.ofp) || fclose (outstate.ofp) != 0)) + write_fatal (); + cleanup (); +@@ -523,6 +551,7 @@ static struct option const longopts[] = + {"posix", no_argument, NULL, CHAR_MAX + 7}, + {"quoting-style", required_argument, NULL, CHAR_MAX + 8}, + {"unified-reject-files", no_argument, NULL, CHAR_MAX + 9}, ++ {"global-reject-file", required_argument, NULL, CHAR_MAX + 10}, + {NULL, no_argument, NULL, 0} + }; + +@@ -582,6 +611,7 @@ static char const *const option_help[] = + " --dry-run Do not actually change any files; just print what would happen.", + " --posix Conform to the POSIX standard.", + " --unified-reject-files Create unified reject files.", ++" --global-reject-file=file Put all rejects into one file.", + "", + " -d DIR --directory=DIR Change the working directory to DIR first.", + #if HAVE_SETMODE_DOS +@@ -784,6 +814,9 @@ get_some_switches (void) + case CHAR_MAX + 9: + unified_reject_files = true; + break; ++ case CHAR_MAX + 10: ++ global_reject = savestr (optarg); ++ break; + default: + usage (stderr, 2); + } +@@ -933,6 +966,37 @@ locate_hunk (LINENUM fuzz) + } + + static char * ++format_timestamp (char timebuf[37], bool which) ++{ ++ time_t ts = pch_timestamp(which); ++ if (ts != -1) ++ { ++ struct tm *tm = localtime(&ts); ++ strftime(timebuf, 37, "\t%Y-%m-%d %H:%M:%S.000000000 %z", tm); ++ } ++ else ++ timebuf[0] = 0; ++ return timebuf; ++} ++ ++/* Write a header in a reject file that combines multiple hunks. */ ++static void ++reject_header (const char *outname) ++{ ++ char timebuf0[37], timebuf1[37]; ++ if (!global_reject) ++ return; ++ if (diff_type == UNI_DIFF) ++ fprintf(rejfp, "--- %s.orig%s\n+++ %s%s\n", ++ outname, format_timestamp(timebuf0, reverse), ++ outname, format_timestamp(timebuf1, !reverse)); ++ else ++ fprintf(rejfp, "*** %s.orig%s\n--- %s%s\n", ++ outname, format_timestamp(timebuf0, reverse), ++ outname, format_timestamp(timebuf1, !reverse)); ++} ++ ++static char * + format_linerange (char rangebuf[LINENUM_LENGTH_BOUND*2 + 2], + LINENUM first, LINENUM lines) + { diff --git a/packages/patch/patch-2.5.9/unified-reject-files.diff b/packages/patch/patch-2.5.9/unified-reject-files.diff new file mode 100644 index 0000000000..6bfa00dd75 --- /dev/null +++ b/packages/patch/patch-2.5.9/unified-reject-files.diff @@ -0,0 +1,305 @@ +Generate unified diff style reject files. Also include the C function names +in reject files whenever possible. + + $ cat > f.orig + < a() { + < 2 + < 3 + < + < 5 + < 6 + < } + + $ sed -e 's/5/5a/' f.orig > f + $ diff -U2 -p f.orig f > f.diff + $ sed -e 's/5/5a/' -e 's/6/6x/' f.orig > f + $ ./patch -F0 -s --no-backup-if-mismatch f --reject-unified < f.diff + > 1 out of 1 hunk FAILED -- saving rejects to file f.rej + + $ cat f.rej + > @@ -3,5 +3,5 @@ a() { + > 3 + > + > -5 + > +5a + > 6 + > } + + $ ./patch -F0 -s --no-backup-if-mismatch f < f.diff + > 1 out of 1 hunk FAILED -- saving rejects to file f.rej + + $ cat f.rej + > *************** a() { + > *** 3,7 **** + > 3 + > + > - 5 + > 6 + > } + > --- 3,7 ---- + > 3 + > + > + 5a + > 6 + > } + + $ diff -Nu -p /dev/null f.orig > f2.diff + $ ./patch -F0 -s --no-backup-if-mismatch f --reject-unified < f2.diff + > Patch attempted to create file f, which already exists. + > 1 out of 1 hunk FAILED -- saving rejects to file f.rej + + $ cat f.rej + > @@ -0,0 +1,7 @@ + > +a() { + > +2 + > +3 + > + + > +5 + > +6 + > +} + + $ rm -f f f.orig f.rej f.diff f2.diff + +Index: patch-2.5.9/pch.c +=================================================================== +--- patch-2.5.9.orig/pch.c ++++ patch-2.5.9/pch.c +@@ -68,6 +68,7 @@ static LINENUM p_sline; /* and the lin + static LINENUM p_hunk_beg; /* line number of current hunk */ + static LINENUM p_efake = -1; /* end of faked up lines--don't free */ + static LINENUM p_bfake = -1; /* beg of faked up lines */ ++static char *p_c_function; /* the C function a hunk is in */ + + enum nametype { OLD, NEW, INDEX, NONE }; + +@@ -888,6 +889,19 @@ another_hunk (enum diff difftype, bool r + next_intuit_at(line_beginning,p_input_line); + return chars_read == (size_t) -1 ? -1 : 0; + } ++ s = buf; ++ while (*s == '*') ++ s++; ++ if (*s == ' ') ++ { ++ p_c_function = s; ++ while (*s != '\n') ++ s++; ++ *s = '\0'; ++ p_c_function = savestr (p_c_function); ++ } ++ else ++ p_c_function = NULL; + p_hunk_beg = p_input_line + 1; + while (p_end < p_max) { + chars_read = get_line (); +@@ -1277,8 +1291,18 @@ another_hunk (enum diff difftype, bool r + else + p_repl_lines = 1; + if (*s == ' ') s++; +- if (*s != '@') ++ if (*s++ != '@') + malformed (); ++ if (*s++ == '@' && *s == ' ' && *s != '\0') ++ { ++ p_c_function = s; ++ while (*s != '\n') ++ s++; ++ *s = '\0'; ++ p_c_function = savestr (p_c_function); ++ } ++ else ++ p_c_function = NULL; + if (!p_ptrn_lines) + p_first++; /* do append rather than insert */ + if (!p_repl_lines) +@@ -1884,6 +1908,12 @@ pch_hunk_beg (void) + return p_hunk_beg; + } + ++char const * ++pch_c_function (void) ++{ ++ return p_c_function; ++} ++ + /* Is the newline-terminated line a valid `ed' command for patch + input? If so, return the command character; if not, return 0. + This accepts accepts just a subset of the valid commands, but it's +Index: patch-2.5.9/pch.h +=================================================================== +--- patch-2.5.9.orig/pch.h ++++ patch-2.5.9/pch.h +@@ -25,6 +25,7 @@ + LINENUM pch_end (void); + LINENUM pch_first (void); + LINENUM pch_hunk_beg (void); ++char const *pch_c_function (void); + LINENUM pch_newfirst (void); + LINENUM pch_prefix_context (void); + LINENUM pch_ptrn_lines (void); +Index: patch-2.5.9/patch.man +=================================================================== +--- patch-2.5.9.orig/patch.man ++++ patch-2.5.9/patch.man +@@ -517,6 +517,9 @@ instead of the default + .B \&.rej + file. + .TP ++\fB\*=reject\-unified\fP ++Produce unified reject files. The default is to produce context type reject files. ++.TP + \fB\-R\fP or \fB\*=reverse\fP + Assume that this patch was created with the old and new files swapped. + (Yes, I'm afraid that does happen occasionally, human nature being what it +Index: patch-2.5.9/common.h +=================================================================== +--- patch-2.5.9.orig/common.h ++++ patch-2.5.9/common.h +@@ -146,6 +146,7 @@ XTERN int invc; + XTERN struct stat instat; + XTERN bool dry_run; + XTERN bool posixly_correct; ++XTERN bool unified_reject_files; + + XTERN char const *origprae; + XTERN char const *origbase; +Index: patch-2.5.9/patch.c +=================================================================== +--- patch-2.5.9.orig/patch.c ++++ patch-2.5.9/patch.c +@@ -522,6 +522,7 @@ static struct option const longopts[] = + {"no-backup-if-mismatch", no_argument, NULL, CHAR_MAX + 6}, + {"posix", no_argument, NULL, CHAR_MAX + 7}, + {"quoting-style", required_argument, NULL, CHAR_MAX + 8}, ++ {"unified-reject-files", no_argument, NULL, CHAR_MAX + 9}, + {NULL, no_argument, NULL, 0} + }; + +@@ -580,6 +581,7 @@ static char const *const option_help[] = + " --verbose Output extra information about the work being done.", + " --dry-run Do not actually change any files; just print what would happen.", + " --posix Conform to the POSIX standard.", ++" --unified-reject-files Create unified reject files.", + "", + " -d DIR --directory=DIR Change the working directory to DIR first.", + #if HAVE_SETMODE_DOS +@@ -779,6 +781,9 @@ get_some_switches (void) + (enum quoting_style) i); + } + break; ++ case CHAR_MAX + 9: ++ unified_reject_files = true; ++ break; + default: + usage (stderr, 2); + } +@@ -927,6 +932,24 @@ locate_hunk (LINENUM fuzz) + return 0; + } + ++static char * ++format_linerange (char rangebuf[LINENUM_LENGTH_BOUND*2 + 2], ++ LINENUM first, LINENUM lines) ++{ ++ if (lines == 1) ++ rangebuf = format_linenum (rangebuf, first); ++ else ++ { ++ char *rb; ++ rangebuf = format_linenum (rangebuf + LINENUM_LENGTH_BOUND + 1, lines); ++ rb = rangebuf-1; ++ rangebuf = format_linenum (rangebuf - LINENUM_LENGTH_BOUND - 1, ++ (lines > 0) ? first : 0); ++ *rb = ','; ++ } ++ return rangebuf; ++} ++ + /* We did not find the pattern, dump out the hunk so they can handle it. */ + + static void +@@ -943,8 +966,83 @@ abort_hunk (void) + (int) NEW_CONTEXT_DIFF <= (int) diff_type ? " ****" : ""; + char const *minuses = + (int) NEW_CONTEXT_DIFF <= (int) diff_type ? " ----" : " -----"; ++ char const *function = pch_c_function(); ++ if (function == NULL) ++ function = ""; ++ ++ if (unified_reject_files) ++ { ++ /* produce unified reject files */ ++ char rangebuf0[LINENUM_LENGTH_BOUND*2 + 2]; ++ char rangebuf1[LINENUM_LENGTH_BOUND*2 + 2]; ++ LINENUM j; ++ ++ /* Find the beginning of the remove and insert section. */ ++ for (j = 0; j <= pat_end; j++) ++ if (pch_char (j) == '=') ++ break; ++ for (i = j+1; i <= pat_end; i++) ++ if (pch_char (i) == '^') ++ break; ++ if (pch_char (0) != '*' || j > pat_end || i > pat_end+1) ++ fatal ("internal error in abort_hunk"); ++ i = 1; j++; ++ ++ /* @@ -from,lines +to,lines @@ */ ++ fprintf (rejfp, "@@ -%s +%s @@%s\n", ++ format_linerange (rangebuf0, oldfirst, pch_ptrn_lines()), ++ format_linerange (rangebuf1, newfirst, pch_repl_lines()), ++ function); ++ ++ while ( (i <= pat_end && pch_char (i) != '=') ++ || (j <= pat_end && pch_char (j) != '^')) ++ { ++ if (i <= pat_end ++ && (pch_char (i) == '-' || pch_char (i) == '!')) ++ { ++ fputc('-', rejfp); ++ pch_write_line (i++, rejfp); ++ } ++ else if (j <= pat_end ++ && (pch_char (j) == '+' || pch_char (j) == '!')) ++ { ++ fputc('+', rejfp); ++ pch_write_line (j++, rejfp); ++ } ++ else if ((i <= pat_end ++ && (pch_char (i) == ' ' || pch_char (i) == '\n')) && ++ (j > pat_end ++ || (pch_char (j) == ' ' || pch_char (j) == '\n'))) ++ { ++ /* Unless j is already past the end, lines i and j ++ must be equal here. */ ++ ++ if (pch_char (i) == ' ') ++ fputc(' ', rejfp); ++ pch_write_line (i++, rejfp); ++ if (j <= pat_end) ++ j++; ++ } ++ else if ((j <= pat_end && ++ (pch_char (j) == ' ' || pch_char (j) == '\n')) && ++ (pch_char (i) == '=')) ++ { ++ if (pch_char (j) == ' ') ++ fputc(' ', rejfp); ++ pch_write_line (j++, rejfp); ++ } ++ else ++ fatal ("internal error in abort_hunk"); ++ } ++ ++ if (ferror (rejfp)) ++ write_fatal (); ++ return; ++ } + +- fprintf(rejfp, "***************\n"); ++ /* produce context type reject files */ ++ ++ fprintf(rejfp, "***************%s\n", function); + for (i=0; i<=pat_end; i++) { + char numbuf0[LINENUM_LENGTH_BOUND + 1]; + char numbuf1[LINENUM_LENGTH_BOUND + 1]; diff --git a/packages/patch/patch_2.5.9.bb b/packages/patch/patch_2.5.9.bb index 103337b4c9..940b15a205 100644 --- a/packages/patch/patch_2.5.9.bb +++ b/packages/patch/patch_2.5.9.bb @@ -3,5 +3,8 @@ require patch.inc SRC_URI = "${GNU_MIRROR}/patch/patch-2.5.4.tar.gz \ file://2.5.9.patch;patch=1 \ file://debian.patch;patch=1 \ - file://install.patch;patch=1" + file://install.patch;patch=1 \ + file://unified-reject-files.diff;patch=1 \ + file://global-reject-file.diff;patch=1 " S = "${WORKDIR}/patch-2.5.4" +PR = "r1"
\ No newline at end of file diff --git a/packages/qemu/files/arm_nptl.patch b/packages/qemu/files/arm_nptl.patch index 958c27e5e1..f9b10aebc5 100644 --- a/packages/qemu/files/arm_nptl.patch +++ b/packages/qemu/files/arm_nptl.patch @@ -1,25 +1,25 @@ Index: qemu/configure =================================================================== ---- qemu.orig/configure 2006-08-14 22:09:39.000000000 +0100 -+++ qemu/configure 2006-08-14 22:38:54.000000000 +0100 -@@ -96,6 +96,7 @@ - user="no" +--- qemu.orig/configure 2006-08-26 16:31:53.000000000 +0100 ++++ qemu/configure 2006-08-26 16:31:53.000000000 +0100 +@@ -97,6 +97,7 @@ build_docs="no" + build_acpi_tables="no" uname_release="" +nptl="yes" # OS specific targetos=`uname -s` -@@ -240,6 +241,8 @@ +@@ -243,6 +244,8 @@ ;; - --enable-uname-release=*) uname_release="$optarg" + --enable-iasl) build_acpi_tables="yes" ;; + --disable-nptl) nptl="no" + ;; esac done -@@ -438,6 +441,23 @@ +@@ -441,6 +444,23 @@ fi fi @@ -43,7 +43,7 @@ Index: qemu/configure ########################################## # SDL probe -@@ -556,6 +576,7 @@ +@@ -559,6 +579,7 @@ fi echo "FMOD support $fmod $fmod_support" echo "kqemu support $kqemu" @@ -51,7 +51,7 @@ Index: qemu/configure echo "Documentation $build_docs" [ ! -z "$uname_release" ] && \ echo "uname -r $uname_release" -@@ -864,6 +885,14 @@ +@@ -880,6 +901,14 @@ echo "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak fi fi @@ -68,8 +68,8 @@ Index: qemu/configure if test "$cocoa" = "yes" ; then Index: qemu/exec-all.h =================================================================== ---- qemu.orig/exec-all.h 2006-05-26 18:10:52.000000000 +0100 -+++ qemu/exec-all.h 2006-08-14 22:37:29.000000000 +0100 +--- qemu.orig/exec-all.h 2006-08-26 16:28:32.000000000 +0100 ++++ qemu/exec-all.h 2006-08-26 16:31:53.000000000 +0100 @@ -347,163 +347,7 @@ extern CPUReadMemoryFunc *io_mem_read[IO_MEM_NB_ENTRIES][4]; extern void *io_mem_opaque[IO_MEM_NB_ENTRIES]; @@ -237,8 +237,8 @@ Index: qemu/exec-all.h Index: qemu/linux-user/arm/syscall.h =================================================================== ---- qemu.orig/linux-user/arm/syscall.h 2005-04-27 21:11:21.000000000 +0100 -+++ qemu/linux-user/arm/syscall.h 2006-08-14 22:37:29.000000000 +0100 +--- qemu.orig/linux-user/arm/syscall.h 2006-03-09 19:18:11.000000000 +0000 ++++ qemu/linux-user/arm/syscall.h 2006-08-26 16:31:53.000000000 +0100 @@ -28,7 +28,9 @@ #define ARM_SYSCALL_BASE 0x900000 #define ARM_THUMB_SYSCALL 0 @@ -252,9 +252,9 @@ Index: qemu/linux-user/arm/syscall.h #define ARM_NR_thumb_semihosting 0xAB Index: qemu/linux-user/main.c =================================================================== ---- qemu.orig/linux-user/main.c 2006-05-26 18:11:01.000000000 +0100 -+++ qemu/linux-user/main.c 2006-08-14 22:37:29.000000000 +0100 -@@ -331,6 +331,50 @@ +--- qemu.orig/linux-user/main.c 2006-08-26 16:28:40.000000000 +0100 ++++ qemu/linux-user/main.c 2006-08-26 16:31:53.000000000 +0100 +@@ -309,6 +309,50 @@ } } @@ -305,7 +305,7 @@ Index: qemu/linux-user/main.c void cpu_loop(CPUARMState *env) { int trapnr; -@@ -387,10 +431,8 @@ +@@ -365,10 +409,8 @@ } } @@ -318,7 +318,7 @@ Index: qemu/linux-user/main.c env->regs[0] = do_arm_semihosting (env); } else if (n == 0 || n >= ARM_SYSCALL_BASE || (env->thumb && n == ARM_THUMB_SYSCALL)) { -@@ -401,14 +443,34 @@ +@@ -379,14 +421,34 @@ n -= ARM_SYSCALL_BASE; env->eabi = 0; } @@ -361,7 +361,7 @@ Index: qemu/linux-user/main.c } else { goto error; } -@@ -447,6 +509,10 @@ +@@ -425,6 +487,10 @@ } } break; @@ -372,7 +372,7 @@ Index: qemu/linux-user/main.c default: error: fprintf(stderr, "qemu: unhandled CPU exception 0x%x - aborting\n", -@@ -1649,6 +1715,10 @@ +@@ -1639,6 +1705,10 @@ ts->heap_base = info->brk; /* This will be filled in on the first SYS_HEAPINFO call. */ ts->heap_limit = 0; @@ -385,22 +385,22 @@ Index: qemu/linux-user/main.c { Index: qemu/linux-user/qemu.h =================================================================== ---- qemu.orig/linux-user/qemu.h 2006-05-26 18:11:01.000000000 +0100 -+++ qemu/linux-user/qemu.h 2006-08-14 22:37:29.000000000 +0100 -@@ -76,6 +76,9 @@ +--- qemu.orig/linux-user/qemu.h 2006-08-26 16:28:40.000000000 +0100 ++++ qemu/linux-user/qemu.h 2006-08-26 16:33:50.000000000 +0100 +@@ -75,6 +75,9 @@ uint32_t v86mask; #endif int used; /* non zero if used */ +#ifdef USE_NPTL + uint32_t *child_tidptr; +#endif + struct image_info *info; uint8_t stack[0]; } __attribute__((aligned(16))) TaskState; - Index: qemu/linux-user/syscall.c =================================================================== ---- qemu.orig/linux-user/syscall.c 2006-05-26 18:11:01.000000000 +0100 -+++ qemu/linux-user/syscall.c 2006-08-14 22:44:47.000000000 +0100 +--- qemu.orig/linux-user/syscall.c 2006-08-26 16:28:40.000000000 +0100 ++++ qemu/linux-user/syscall.c 2006-08-26 16:31:53.000000000 +0100 @@ -66,9 +66,18 @@ #include <linux/kd.h> @@ -420,7 +420,7 @@ Index: qemu/linux-user/syscall.c #if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_SPARC) /* 16 bit uid wrappers emulation */ #define USE_UID16 -@@ -1569,20 +1578,38 @@ +@@ -1602,20 +1611,38 @@ thread/process */ #define NEW_STACK_SIZE 8192 @@ -460,7 +460,7 @@ Index: qemu/linux-user/syscall.c if (flags & CLONE_VM) { ts = malloc(sizeof(TaskState) + NEW_STACK_SIZE); -@@ -1627,16 +1654,60 @@ +@@ -1665,16 +1692,60 @@ #error unsupported target CPU #endif new_env->opaque = ts; @@ -525,7 +525,7 @@ Index: qemu/linux-user/syscall.c } return ret; } -@@ -1880,7 +1951,7 @@ +@@ -1918,7 +1989,7 @@ ret = do_brk(arg1); break; case TARGET_NR_fork: @@ -534,7 +534,7 @@ Index: qemu/linux-user/syscall.c break; case TARGET_NR_waitpid: { -@@ -2836,7 +2907,8 @@ +@@ -2989,7 +3060,8 @@ ret = get_errno(fsync(arg1)); break; case TARGET_NR_clone: @@ -544,7 +544,7 @@ Index: qemu/linux-user/syscall.c break; #ifdef __NR_exit_group /* new thread calls */ -@@ -3186,7 +3258,8 @@ +@@ -3339,7 +3411,8 @@ #endif #ifdef TARGET_NR_vfork case TARGET_NR_vfork: @@ -554,15 +554,15 @@ Index: qemu/linux-user/syscall.c break; #endif #ifdef TARGET_NR_ugetrlimit -@@ -3681,4 +3754,3 @@ +@@ -3838,4 +3911,3 @@ #endif return ret; } - Index: qemu/target-arm/cpu.h =================================================================== ---- qemu.orig/target-arm/cpu.h 2006-02-20 00:33:36.000000000 +0000 -+++ qemu/target-arm/cpu.h 2006-08-14 22:39:35.000000000 +0100 +--- qemu.orig/target-arm/cpu.h 2006-03-09 19:18:27.000000000 +0000 ++++ qemu/target-arm/cpu.h 2006-08-26 16:31:53.000000000 +0100 @@ -35,6 +35,9 @@ #define EXCP_IRQ 5 #define EXCP_FIQ 6 @@ -612,8 +612,8 @@ Index: qemu/target-arm/cpu.h /* Return the current CPSR value. */ Index: qemu/target-arm/exec.h =================================================================== ---- qemu.orig/target-arm/exec.h 2005-11-26 10:38:39.000000000 +0000 -+++ qemu/target-arm/exec.h 2006-08-14 22:37:29.000000000 +0100 +--- qemu.orig/target-arm/exec.h 2006-03-09 19:18:27.000000000 +0000 ++++ qemu/target-arm/exec.h 2006-08-26 16:31:53.000000000 +0100 @@ -51,8 +51,6 @@ /* In op_helper.c */ @@ -625,8 +625,8 @@ Index: qemu/target-arm/exec.h Index: qemu/target-arm/op.c =================================================================== ---- qemu.orig/target-arm/op.c 2006-02-20 00:33:36.000000000 +0000 -+++ qemu/target-arm/op.c 2006-08-14 22:37:29.000000000 +0100 +--- qemu.orig/target-arm/op.c 2006-08-26 16:28:48.000000000 +0100 ++++ qemu/target-arm/op.c 2006-08-26 16:31:53.000000000 +0100 @@ -891,6 +891,12 @@ cpu_loop_exit(); } @@ -642,9 +642,9 @@ Index: qemu/target-arm/op.c "d" suffix. */ Index: qemu/target-arm/translate.c =================================================================== ---- qemu.orig/target-arm/translate.c 2006-05-26 18:11:04.000000000 +0100 -+++ qemu/target-arm/translate.c 2006-08-14 22:37:29.000000000 +0100 -@@ -2377,6 +2377,7 @@ +--- qemu.orig/target-arm/translate.c 2006-08-26 16:28:48.000000000 +0100 ++++ qemu/target-arm/translate.c 2006-08-26 16:31:53.000000000 +0100 +@@ -2382,6 +2382,7 @@ s->is_jmp = DISAS_JUMP; } @@ -652,7 +652,7 @@ Index: qemu/target-arm/translate.c /* generate intermediate code in gen_opc_buf and gen_opparam_buf for basic block 'tb'. If search_pc is TRUE, also generate PC information for each intermediate instruction. */ -@@ -2411,6 +2412,15 @@ +@@ -2416,6 +2417,15 @@ nb_gen_labels = 0; lj = -1; do { @@ -671,7 +671,7 @@ Index: qemu/target-arm/translate.c Index: qemu/qemu_spinlock.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ qemu/qemu_spinlock.h 2006-08-14 22:37:29.000000000 +0100 ++++ qemu/qemu_spinlock.h 2006-08-26 16:31:53.000000000 +0100 @@ -0,0 +1,182 @@ +/* + * internal execution defines for qemu diff --git a/packages/qemu/qemu_cvs.bb b/packages/qemu/qemu_cvs.bb index a44ff2bdbc..0dfe01aa11 100644 --- a/packages/qemu/qemu_cvs.bb +++ b/packages/qemu/qemu_cvs.bb @@ -1,10 +1,8 @@ LICENSE = "GPL" -PV = "0.8.0+cvs${SRCDATE}" -PR = "r2" +PV = "0.8.2+cvs${SRCDATE}" SRC_URI = "cvs://anonymous@cvs.savannah.nongnu.org/sources/qemu;method=pserver;rsh=ssh;module=qemu \ file://configure.patch;patch=1 \ - file://mouse_fix-r0.patch;patch=1 \ file://pl110_rgb-r0.patch;patch=1 \ file://arm_nptl.patch;patch=1" diff --git a/packages/syslog-ng/files/syslog-ng.conf b/packages/syslog-ng/files/syslog-ng.conf new file mode 100644 index 0000000000..4d1e9f8b22 --- /dev/null +++ b/packages/syslog-ng/files/syslog-ng.conf @@ -0,0 +1,89 @@ +# +# Syslog-ng example configuration for for Debian GNU/Linux +# +# Copyright (c) 1999 anonymous +# Copyright (c) 1999 Balazs Scheidler +# $Id: syslog-ng.conf.sample,v 1.3 2003/05/20 08:57:27 asd Exp $ +# +# Syslog-ng configuration file, compatible with default Debian syslogd +# installation. +# + +options { long_hostnames(off); sync(0); }; + +source src { file("/proc/kmsg"); unix-stream("/dev/log"); internal(); }; +source net { udp(); }; + +destination authlog { file("/var/log/auth.log"); }; +destination syslog { file("/var/log/syslog"); }; +destination cron { file("/var/log/cron.log"); }; +destination daemon { file("/var/log/daemon.log"); }; +destination kern { file("/var/log/kern.log"); }; +destination lpr { file("/var/log/lpr.log"); }; +destination user { file("/var/log/user.log"); }; +destination uucp { file("/var/log/uucp.log"); }; +destination ppp { file("/var/log/ppp.log"); }; +destination mail { file("/var/log/mail.log"); }; + +destination mailinfo { file("/var/log/mail.info"); }; +destination mailwarn { file("/var/log/mail.warn"); }; +destination mailerr { file("/var/log/mail.err"); }; + +destination newscrit { file("/var/log/news/news.crit"); }; +destination newserr { file("/var/log/news/news.err"); }; +destination newsnotice { file("/var/log/news/news.notice"); }; + +destination debug { file("/var/log/debug"); }; +destination messages { file("/var/log/messages"); }; +destination console { usertty("root"); }; +destination console_all { file("/dev/tty12"); }; +#destination loghost { udp("loghost" port(999)); }; + + +destination xconsole { pipe("/dev/xconsole"); }; + +filter f_auth { facility(auth); }; +filter f_authpriv { facility(auth, authpriv); }; +filter f_syslog { not facility(authpriv, mail); }; +filter f_cron { facility(cron); }; +filter f_daemon { facility(daemon); }; +filter f_kern { facility(kern); }; +filter f_lpr { facility(lpr); }; +filter f_mail { facility(mail); }; +filter f_user { facility(user); }; +filter f_uucp { facility(cron); }; +filter f_ppp { facility(local2); }; +filter f_news { facility(news); }; +filter f_debug { not facility(auth, authpriv, news, mail); }; +filter f_messages { level(info..warn) + and not facility(auth, authpriv, mail, news); }; +filter f_emergency { level(emerg); }; + +filter f_info { level(info); }; +filter f_notice { level(notice); }; +filter f_warn { level(warn); }; +filter f_crit { level(crit); }; +filter f_err { level(err); }; + +log { source(src); filter(f_authpriv); destination(authlog); }; +log { source(src); filter(f_syslog); destination(syslog); }; +log { source(src); filter(f_cron); destination(cron); }; +log { source(src); filter(f_daemon); destination(daemon); }; +log { source(src); filter(f_kern); destination(kern); }; +log { source(src); filter(f_lpr); destination(lpr); }; +log { source(src); filter(f_mail); destination(mail); }; +log { source(src); filter(f_user); destination(user); }; +log { source(src); filter(f_uucp); destination(uucp); }; +log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); }; +log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); }; +log { source(src); filter(f_mail); filter(f_err); destination(mailerr); }; +log { source(src); filter(f_news); filter(f_crit); destination(newscrit); }; +log { source(src); filter(f_news); filter(f_err); destination(newserr); }; +log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); }; +log { source(src); filter(f_debug); destination(debug); }; +log { source(src); filter(f_messages); destination(messages); }; +log { source(src); filter(f_emergency); destination(console); }; +log { source(src); filter(f_ppp); destination(ppp); }; +log { source(src); destination(console_all); }; + + diff --git a/packages/syslog-ng/syslog-ng_1.6.8.bb b/packages/syslog-ng/syslog-ng_1.6.8.bb index 734dc310fb..ce1f77813c 100644 --- a/packages/syslog-ng/syslog-ng_1.6.8.bb +++ b/packages/syslog-ng/syslog-ng_1.6.8.bb @@ -1,9 +1,10 @@ -PR = "r8" +PR = "r9" MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org" DESCRIPTION = "Alternative system logger daemon" DEPENDS = "libol flex" SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz \ + file://syslog-ng.conf \ file://initscript" S = "${WORKDIR}/${PN}-${PV}" @@ -16,7 +17,7 @@ INITSCRIPT_PARAMS = "defaults 05" do_install_append() { install -d ${D}/${sysconfdir}/${PN} - install ${S}/doc/syslog-ng.conf.sample ${D}${sysconfdir}/${PN}/syslog-ng.conf + install ${WORKDIR}/syslog-ng.conf ${D}${sysconfdir}/${PN}/syslog-ng.conf install -d ${D}/${sysconfdir}/init.d install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog-ng } |