devel January 2018

devel@lists.centos.org

23 participants
29 discussions

anaconda dependency calculation?
by Nicholas Byrne 04 Aug '25

04 Aug '25

Hi all, I'm trying to find a tool that calculates all dependencies for a specific package or group of packages for use with CentOS 5 (beta) with the intention of putting together a custom single CD build of CentOS 5. With CentOS 4 i used a python script that used the hdrlist module to find all dependencies which borrowed code from a number of sources. I've looked at yumdownloader and how it checks dependencies (using the --resolve option) but if i pass it the list of packages defined in say the Base and the Core yum groups which generally form an absolute minimal install i end up with about 200 packages. If i do a custom install (using beta 1 disks) and deselect everything i end up with over 300 packages. So i'm guessing anaconda calculates dependencies in a slightly different way, can anyone point me to files/code where i should be looking to find out? Thanks very much in advance for help Nick This e-mail is the property of Quadriga Worldwide Ltd, intended for the addressee only and confidential. Any dissemination, copying or distribution of this message or any attachments is strictly prohibited. If you have received this message in error, please notify us immediately by replying to the message and deleting it from your computer. Messages sent to and from Quadriga may be monitored. Quadriga cannot guarantee any message delivery method is secure or error-free. Information could be intercepted, corrupted, lost, destroyed, arrive late or incomplete, or contain viruses. We do not accept responsibility for any errors or omissions in this message and/or attachment that arise as a result of transmission. You should carry out your own virus checks before opening any attachment. Any views or opinions presented are solely those of the author and do not necessarily represent those of Quadriga.

6 11

forums + portal for {lang}.centos.org sites
by Karanbir Singh 16 Aug '24

16 Aug '24

Hi, Earlier in the evening today Ralph, Fabian and I had a chat about the present state of the language subsites. This email sort of summarises the main issue ( s/w ). We seem to have run into a slight technical hitch with punbb/fluxbb. They dont support LDAP as a backend. And we had decided a few months back that all new rollouts must have ldap backend so we can rollin CentOS-DS / openldap based backend. So we need to look at alternatives, and since the primary focus of these international sites is going be forums : Here is a shortlist ( if there is anything else that people are aware of, please add to this list ) - phpBB - SMF - Fudforum - phorum - fluxbb Requirements: - Must be able to scale ( couple of hundred thousand msgs ) - Must be able to handle ldap auth ( if it cant, whats involved in writing the ldap-auth portion ) - Must address the specific requirements raised by the present www.centos.org forum users ( Can you please fill this section in ? ) - Must support all languages we need ( pure utf8 support would be good ) - Secure - Skin'able Nice to have: - Capable of running multiple instances from a single deployment - responsive community :D Things we will need to do: - Decide on what s/w to use. - Give the ArtWork people enough time to get the look & feel sorted. - Migrate newbb forums from www.centos.org to $system ( hey, english is a language too :D ). - Migrate fr.centos.org into the final s/w - setup {de/es/ja/it/pt_br}.centos.org Actions: Ralph and Fabian are going to work on setting up a test ldap server, once that is online we will then start by installing into our test-vm-farm the various s/w to eval them. If anyone would like to help, please feel free to jump right in. I'll setup a wiki page for this issue, which might be a good place to track progress. -- Karanbir Singh : http://www.karan.org/ : 2522219@icq

22 81

SRPMS for AltArch (more specifically aarch64 kernel)
by Dominique Martinet 22 Aug '18

22 Aug '18

Hi folks, I've asked on IRC and have been pointed to this list. I can't seem to find this particular source rpm: kernel-aarch64-4.5.0-29.el7.src.rpm which is what is pointed by `rpm -qi kernel` on my system. Are these supposed to be available anywhere? Looking on google I only see one for an older release in someone's centos user/people page, but I can't seem to find these in any repo. The debuginfo are properly here but it's good to have sources as well when messing around with low level stuff :) Cheers and thanks for the hard work, -- Dominique Martinet

3 8

Notes from CERN pre-dojo
by Rich Bowen 23 May '18

23 May '18

The notes from the pre-dojo meeting at CERN, yesterday, may be found in the etherpad at https://public.etherpad-mozilla.org/p/cern-centos-thursday Those involved in the various discussion topics are requested to elaborate, where appropriate. Thanks to everyone who attended this very productive discussion. --Rich -- -- Rich Bowen - rbowen(a)redhat.com @rbowen // @rdocommunity // @CentOSProject 859 351 9166

5 7

[RDO] Queens Milestone 3 test day, Feb 8, 9
by Rich Bowen 30 Jan '18

30 Jan '18

We will be testing the RDO OpenStack Queens Milestone 3 packages on February 8th and 9th. Details are at http://rdoproject.org/testday/queens/milestone3/ We will be congregating on the #RDO channel on Freenode IRC for questions, commentary, and so on. We will also be deploying a test cloud, like last time, so that you can test without having to deploy it yourself. Details, and signups, are at https://etherpad.openstack.org/p/rdo-queens-m3-cloud If you have any questions, please bring them to the users(a)lists.rdoproject.org mailing list. You can subscribe to this list at http://lists.rdoproject.org/ -- Rich Bowen: Community Architect rbowen(a)redhat.com @rbowen // @RDOCommunity // @CentOSProject 1 859 351 9166

1 0

Re: [CentOS-devel] [PATCH] Fix memory leak in i18n support for sort utility
by Yousong Zhou 30 Jan '18

30 Jan '18

On 30 January 2018 at 15:58, Kamil Dudka <kdudka(a)redhat.com> wrote: > On Tuesday, January 30, 2018 3:01:54 AM CET Yousong Zhou wrote: >> On 30 January 2018 at 02:58, Kamil Dudka <kdudka(a)redhat.com> wrote: >> > On Wednesday, January 24, 2018 1:18:35 PM CET Yousong Zhou wrote: >> >> This can be triggered by using month sort >> >> >> >> The issue with the original code is that after the call to mbsrtowcs() >> >> and wcsrtombs() returns, the source pointer will be set to NULL causing >> >> the later free() call has no effect at all >> >> --- >> >> The issue also exists in c6 branch >> > >> > Thank you for sharing the patch! This was tracked as Fedora bug #1259942: >> > >> > https://bugzilla.redhat.com/1259942 >> > >> > The bug was fixed in coreutils-8.23-11.fc22 and it is going to be fixed >> > in the next major version of RHEL (and CentOS). >> > >> > Kamil >> >> Hi Kamil. I thought there must exist some kind of mechanism for >> backporting bugfixes of this kind into currently maintained versions. >> It should! It's an old bug already known and fixed in 2015 and still >> people are wasting time and getting frustrated by it in 2018! >> >> yousong > > Sorry to hear that. We do not backport non-critical fixes from Fedora to RHEL > proactively. Updates in RHEL are primarily driven by requests of Red Hat's > customers. > > I have cloned the bug for RHEL-7 to get this fixed eventually: > > https://bugzilla.redhat.com/1540059 > > Unfortunately, I cannot guarantee any schedule for merging the fix. If you > are a customer of Red Hat, please contact the product support and tell them > about this bug. > > Kamil Thanks for doing this. I encountered this bug when I was using sort to --merge multiple log files with month fields of the form Jan, Feb etc. It caused the kernel to oom which was unexpected since the very merge sort should run in linear time complexity with fixed amount of memory. yousong

1 0

Re: [CentOS-devel] [PATCH] Fix memory leak in i18n support for sort utility
by Yousong Zhou 30 Jan '18

30 Jan '18

On 30 January 2018 at 02:58, Kamil Dudka <kdudka(a)redhat.com> wrote: > On Wednesday, January 24, 2018 1:18:35 PM CET Yousong Zhou wrote: >> This can be triggered by using month sort >> >> The issue with the original code is that after the call to mbsrtowcs() >> and wcsrtombs() returns, the source pointer will be set to NULL causing >> the later free() call has no effect at all >> --- >> The issue also exists in c6 branch > > Thank you for sharing the patch! This was tracked as Fedora bug #1259942: > > https://bugzilla.redhat.com/1259942 > > The bug was fixed in coreutils-8.23-11.fc22 and it is going to be fixed > in the next major version of RHEL (and CentOS). > > Kamil Hi Kamil. I thought there must exist some kind of mechanism for backporting bugfixes of this kind into currently maintained versions. It should! It's an old bug already known and fixed in 2015 and still people are wasting time and getting frustrated by it in 2018! yousong > >> SOURCES/coreutils-i18n.patch | 45 >> ++++++++++++++++++++++---------------------- 1 file changed, 22 >> insertions(+), 23 deletions(-) >> >> diff --git a/SOURCES/coreutils-i18n.patch b/SOURCES/coreutils-i18n.patch >> index a3c7b33..cdcaffd 100644 >> --- a/SOURCES/coreutils-i18n.patch >> +++ b/SOURCES/coreutils-i18n.patch >> @@ -2963,7 +2963,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c >> coreutils-8.22/src/sort.c line->keybeg = line_start; >> } >> } >> -@@ -1945,7 +2291,7 @@ human_numcompare (char const *a, char co >> +@@ -1943,7 +2289,7 @@ human_numcompare (char *a, char *b) >> hideously fast. */ >> >> static int >> @@ -2972,7 +2972,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c >> coreutils-8.22/src/sort.c { >> while (blanks[to_uchar (*a)]) >> a++; >> -@@ -1955,6 +2301,25 @@ numcompare (char const *a, char const *b >> +@@ -1953,6 +2299,25 @@ numcompare (char const *a, char const *b >> return strnumcmp (a, b, decimal_point, thousands_sep); >> } >> >> @@ -2998,7 +2998,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c >> coreutils-8.22/src/sort.c /* Work around a problem whereby the long double >> value returned by glibc's strtold ("NaN", ...) contains uninitialized bits: >> clear all bytes of A and B before calling strtold. FIXME: remove this >> function once -@@ -2005,7 +2370,7 @@ general_numcompare (char const *sa, >> char >> +@@ -2003,7 +2368,7 @@ general_numcompare (char const *sa, char >> Return 0 if the name in S is not recognized. */ >> >> static int >> @@ -3007,7 +3007,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c >> coreutils-8.22/src/sort.c { >> size_t lo = 0; >> size_t hi = MONTHS_PER_YEAR; >> -@@ -2280,15 +2645,14 @@ debug_key (struct line const *line, stru >> +@@ -2278,15 +2643,14 @@ debug_key (struct line const *line, stru >> char saved = *lim; >> *lim = '\0'; >> >> @@ -3025,7 +3025,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c >> coreutils-8.22/src/sort.c else if (key->general_numeric) >> ignore_value (strtold (beg, &tighter_lim)); >> else if (key->numeric || key->human_numeric) >> -@@ -2432,7 +2796,7 @@ key_warnings (struct keyfield const *gke >> +@@ -2430,7 +2794,7 @@ key_warnings (struct keyfield const *gke >> bool maybe_space_aligned = !hard_LC_COLLATE && default_key_compare >> (key) && !(key->schar || key->echar); bool line_offset = key->eword == 0 && >> key->echar != 0; /* -k1.x,1.y */ @@ -3034,7 +3034,7 @@ diff -urNp >> coreutils-8.22-orig/src/sort.c coreutils-8.22/src/sort.c && >> ((!key->skipsblanks && !(implicit_skip || maybe_space_aligned)) >> || (!key->skipsblanks && key->schar) >> || (!key->skipeblanks && key->echar))) >> >> -@@ -2490,11 +2854,87 @@ key_warnings (struct keyfield const *gke >> +@@ -2488,11 +2852,86 @@ key_warnings (struct keyfield const *gke >> error (0, 0, _("option '-r' only applies to last-resort comparison")); >> } >> >> @@ -3047,8 +3047,8 @@ diff -urNp coreutils-8.22-orig/src/sort.c >> coreutils-8.22/src/sort.c + register int lo = 0, hi = MONTHS_PER_YEAR, >> result; >> + char *tmp; >> + size_t wclength, mblength; >> -+ const char **pp; >> -+ const wchar_t **wpp; >> ++ const char *pp; >> ++ const wchar_t *wpp; >> + wchar_t *month_wcs; >> + mbstate_t state; >> + >> @@ -3066,12 +3066,12 @@ diff -urNp coreutils-8.22-orig/src/sort.c >> coreutils-8.22/src/sort.c + tmp = (char *) xmalloc (len + 1); >> + memcpy (tmp, s, len); >> + tmp[len] = '\0'; >> -+ pp = (const char **)&tmp; >> + month_wcs = (wchar_t *) xmalloc ((len + 1) * sizeof (wchar_t)); >> + memset (&state, '\0', sizeof(mbstate_t)); >> + >> -+ wclength = mbsrtowcs (month_wcs, pp, len + 1, &state); >> -+ if (wclength == (size_t)-1 || *pp != NULL) >> ++ pp = tmp; >> ++ wclength = mbsrtowcs (month_wcs, &pp, len + 1, &state); >> ++ if (wclength == (size_t)-1 || pp != NULL) >> + error (SORT_FAILURE, 0, _("Invalid multibyte input %s."), quote(s)); >> + >> + for (i = 0; i < wclength; i++) >> @@ -3084,10 +3084,9 @@ diff -urNp coreutils-8.22-orig/src/sort.c >> coreutils-8.22/src/sort.c + } >> + } >> + >> -+ wpp = (const wchar_t **)&month_wcs; >> -+ >> -+ mblength = wcsrtombs (month, wpp, len + 1, &state); >> -+ assert (mblength != (-1) && *wpp == NULL); >> ++ wpp = month_wcs; >> ++ mblength = wcsrtombs (month, &wpp, len + 1, &state); >> ++ assert (mblength != (-1) && wpp == NULL); >> + >> + do >> + { >> @@ -3123,7 +3122,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c >> coreutils-8.22/src/sort.c { >> struct keyfield *key = keylist; >> >> -@@ -2579,7 +3019,7 @@ keycompare (struct line const *a, struct >> +@@ -2577,7 +3016,7 @@ keycompare (struct line const *a, struct >> else if (key->human_numeric) >> diff = human_numcompare (ta, tb); >> else if (key->month) >> @@ -3132,7 +3131,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c >> coreutils-8.22/src/sort.c else if (key->random) >> diff = compare_random (ta, tlena, tb, tlenb); >> else if (key->version) >> -@@ -2695,6 +3135,209 @@ keycompare (struct line const *a, struct >> +@@ -2693,6 +3132,209 @@ keycompare (struct line const *a, struct >> return key->reverse ? -diff : diff; >> } >> >> @@ -3342,7 +3341,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c >> coreutils-8.22/src/sort.c /* Compare two lines A and B, returning negative, >> zero, or positive depending on whether A compares less than, equal to, or >> greater than B. */ >> >> -@@ -2722,7 +3365,7 @@ compare (struct line const *a, struct li >> +@@ -2720,7 +3362,7 @@ compare (struct line const *a, struct li >> diff = - NONZERO (blen); >> else if (blen == 0) >> diff = 1; >> @@ -3351,7 +3350,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c >> coreutils-8.22/src/sort.c { >> /* Note xmemcoll0 is a performance enhancement as >> it will not unconditionally write '\0' after the >> -@@ -4113,6 +4756,7 @@ set_ordering (char const *s, struct keyf >> +@@ -4111,6 +4753,7 @@ set_ordering (char const *s, struct keyf >> break; >> case 'f': >> key->translate = fold_toupper; >> @@ -3359,7 +3358,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c >> coreutils-8.22/src/sort.c break; >> case 'g': >> key->general_numeric = true; >> -@@ -4190,7 +4834,7 @@ main (int argc, char **argv) >> +@@ -4188,7 +4831,7 @@ main (int argc, char **argv) >> initialize_exit_failure (SORT_FAILURE); >> >> hard_LC_COLLATE = hard_locale (LC_COLLATE); >> @@ -3368,7 +3367,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c >> coreutils-8.22/src/sort.c hard_LC_TIME = hard_locale (LC_TIME); >> #endif >> >> -@@ -4211,6 +4855,29 @@ main (int argc, char **argv) >> +@@ -4209,6 +4852,29 @@ main (int argc, char **argv) >> thousands_sep = -1; >> } >> >> @@ -3398,7 +3397,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c >> coreutils-8.22/src/sort.c have_read_stdin = false; >> inittables (); >> >> -@@ -4485,13 +5152,34 @@ main (int argc, char **argv) >> +@@ -4483,13 +5149,34 @@ main (int argc, char **argv) >> >> case 't': >> { >> @@ -3437,7 +3436,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c >> coreutils-8.22/src/sort.c else >> { >> /* Provoke with 'sort -txx'. Complain about >> -@@ -4502,9 +5190,12 @@ main (int argc, char **argv) >> +@@ -4500,9 +5187,12 @@ main (int argc, char **argv) >> quote (optarg)); >> } >> }

1 0

IBM ppc64{le} builders offline for CBS/koji
by Fabian Arrotin 29 Jan '18

29 Jan '18

Hi, Our monitoring platform informed us that the ppc64{le} builders used in our Koji environment are actually unreachable (same for the underlying IBM P8 hypervisor node) After investigation it seems that it's hardware issue I'll work with the DC people next monday to see how we can try to fix the issue and I'll also investigate some options to have at least one builder per arch asap (so ppc64 and ppc64le) That means that people building for multiple arches will be impacted as long as those builders will not be back online (or some equivalent node that can take those $arch jobs) I'll keep the list informed about a status update as soon as possible. -- Fabian Arrotin The CentOS Project | https://www.centos.org gpg key: 56BEC54E | twitter: @arrfab

1 2

CentOS PaaS SIG meeting (2018-01-24)
by Troy Dawson 24 Jan '18

24 Jan '18

Hello, It's time for our weekly PaaS SIG sync-up meeting Time: 1700 UTC - Wedensdays (date -d "1700 UTC") Date: Today Wedensday, 24 January 2018 Where: IRC- Freenode - #centos-devel Agenda: - OpenShift Current Status -- rpms -- Automated rpm building and Automated testing -- Multi-arch -- Documentation -- Images and Image building - Open Floor Minutes from last meeting: https://www.centos.org/minutes/2018/January/centos-devel.2018-01-17-17.00.h…

1 0

[PATCH] Fix memory leak in i18n support for sort utility
by Yousong Zhou 24 Jan '18

24 Jan '18

This can be triggered by using month sort The issue with the original code is that after the call to mbsrtowcs() and wcsrtombs() returns, the source pointer will be set to NULL causing the later free() call has no effect at all --- The issue also exists in c6 branch SOURCES/coreutils-i18n.patch | 45 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/SOURCES/coreutils-i18n.patch b/SOURCES/coreutils-i18n.patch index a3c7b33..cdcaffd 100644 --- a/SOURCES/coreutils-i18n.patch +++ b/SOURCES/coreutils-i18n.patch @@ -2963,7 +2963,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c coreutils-8.22/src/sort.c line->keybeg = line_start; } } -@@ -1945,7 +2291,7 @@ human_numcompare (char const *a, char co +@@ -1943,7 +2289,7 @@ human_numcompare (char *a, char *b) hideously fast. */ static int @@ -2972,7 +2972,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c coreutils-8.22/src/sort.c { while (blanks[to_uchar (*a)]) a++; -@@ -1955,6 +2301,25 @@ numcompare (char const *a, char const *b +@@ -1953,6 +2299,25 @@ numcompare (char const *a, char const *b return strnumcmp (a, b, decimal_point, thousands_sep); } @@ -2998,7 +2998,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c coreutils-8.22/src/sort.c /* Work around a problem whereby the long double value returned by glibc's strtold ("NaN", ...) contains uninitialized bits: clear all bytes of A and B before calling strtold. FIXME: remove this function once -@@ -2005,7 +2370,7 @@ general_numcompare (char const *sa, char +@@ -2003,7 +2368,7 @@ general_numcompare (char const *sa, char Return 0 if the name in S is not recognized. */ static int @@ -3007,7 +3007,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c coreutils-8.22/src/sort.c { size_t lo = 0; size_t hi = MONTHS_PER_YEAR; -@@ -2280,15 +2645,14 @@ debug_key (struct line const *line, stru +@@ -2278,15 +2643,14 @@ debug_key (struct line const *line, stru char saved = *lim; *lim = '\0'; @@ -3025,7 +3025,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c coreutils-8.22/src/sort.c else if (key->general_numeric) ignore_value (strtold (beg, &tighter_lim)); else if (key->numeric || key->human_numeric) -@@ -2432,7 +2796,7 @@ key_warnings (struct keyfield const *gke +@@ -2430,7 +2794,7 @@ key_warnings (struct keyfield const *gke bool maybe_space_aligned = !hard_LC_COLLATE && default_key_compare (key) && !(key->schar || key->echar); bool line_offset = key->eword == 0 && key->echar != 0; /* -k1.x,1.y */ @@ -3034,7 +3034,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c coreutils-8.22/src/sort.c && ((!key->skipsblanks && !(implicit_skip || maybe_space_aligned)) || (!key->skipsblanks && key->schar) || (!key->skipeblanks && key->echar))) -@@ -2490,11 +2854,87 @@ key_warnings (struct keyfield const *gke +@@ -2488,11 +2852,86 @@ key_warnings (struct keyfield const *gke error (0, 0, _("option '-r' only applies to last-resort comparison")); } @@ -3047,8 +3047,8 @@ diff -urNp coreutils-8.22-orig/src/sort.c coreutils-8.22/src/sort.c + register int lo = 0, hi = MONTHS_PER_YEAR, result; + char *tmp; + size_t wclength, mblength; -+ const char **pp; -+ const wchar_t **wpp; ++ const char *pp; ++ const wchar_t *wpp; + wchar_t *month_wcs; + mbstate_t state; + @@ -3066,12 +3066,12 @@ diff -urNp coreutils-8.22-orig/src/sort.c coreutils-8.22/src/sort.c + tmp = (char *) xmalloc (len + 1); + memcpy (tmp, s, len); + tmp[len] = '\0'; -+ pp = (const char **)&tmp; + month_wcs = (wchar_t *) xmalloc ((len + 1) * sizeof (wchar_t)); + memset (&state, '\0', sizeof(mbstate_t)); + -+ wclength = mbsrtowcs (month_wcs, pp, len + 1, &state); -+ if (wclength == (size_t)-1 || *pp != NULL) ++ pp = tmp; ++ wclength = mbsrtowcs (month_wcs, &pp, len + 1, &state); ++ if (wclength == (size_t)-1 || pp != NULL) + error (SORT_FAILURE, 0, _("Invalid multibyte input %s."), quote(s)); + + for (i = 0; i < wclength; i++) @@ -3084,10 +3084,9 @@ diff -urNp coreutils-8.22-orig/src/sort.c coreutils-8.22/src/sort.c + } + } + -+ wpp = (const wchar_t **)&month_wcs; -+ -+ mblength = wcsrtombs (month, wpp, len + 1, &state); -+ assert (mblength != (-1) && *wpp == NULL); ++ wpp = month_wcs; ++ mblength = wcsrtombs (month, &wpp, len + 1, &state); ++ assert (mblength != (-1) && wpp == NULL); + + do + { @@ -3123,7 +3122,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c coreutils-8.22/src/sort.c { struct keyfield *key = keylist; -@@ -2579,7 +3019,7 @@ keycompare (struct line const *a, struct +@@ -2577,7 +3016,7 @@ keycompare (struct line const *a, struct else if (key->human_numeric) diff = human_numcompare (ta, tb); else if (key->month) @@ -3132,7 +3131,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c coreutils-8.22/src/sort.c else if (key->random) diff = compare_random (ta, tlena, tb, tlenb); else if (key->version) -@@ -2695,6 +3135,209 @@ keycompare (struct line const *a, struct +@@ -2693,6 +3132,209 @@ keycompare (struct line const *a, struct return key->reverse ? -diff : diff; } @@ -3342,7 +3341,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c coreutils-8.22/src/sort.c /* Compare two lines A and B, returning negative, zero, or positive depending on whether A compares less than, equal to, or greater than B. */ -@@ -2722,7 +3365,7 @@ compare (struct line const *a, struct li +@@ -2720,7 +3362,7 @@ compare (struct line const *a, struct li diff = - NONZERO (blen); else if (blen == 0) diff = 1; @@ -3351,7 +3350,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c coreutils-8.22/src/sort.c { /* Note xmemcoll0 is a performance enhancement as it will not unconditionally write '\0' after the -@@ -4113,6 +4756,7 @@ set_ordering (char const *s, struct keyf +@@ -4111,6 +4753,7 @@ set_ordering (char const *s, struct keyf break; case 'f': key->translate = fold_toupper; @@ -3359,7 +3358,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c coreutils-8.22/src/sort.c break; case 'g': key->general_numeric = true; -@@ -4190,7 +4834,7 @@ main (int argc, char **argv) +@@ -4188,7 +4831,7 @@ main (int argc, char **argv) initialize_exit_failure (SORT_FAILURE); hard_LC_COLLATE = hard_locale (LC_COLLATE); @@ -3368,7 +3367,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c coreutils-8.22/src/sort.c hard_LC_TIME = hard_locale (LC_TIME); #endif -@@ -4211,6 +4855,29 @@ main (int argc, char **argv) +@@ -4209,6 +4852,29 @@ main (int argc, char **argv) thousands_sep = -1; } @@ -3398,7 +3397,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c coreutils-8.22/src/sort.c have_read_stdin = false; inittables (); -@@ -4485,13 +5152,34 @@ main (int argc, char **argv) +@@ -4483,13 +5149,34 @@ main (int argc, char **argv) case 't': { @@ -3437,7 +3436,7 @@ diff -urNp coreutils-8.22-orig/src/sort.c coreutils-8.22/src/sort.c else { /* Provoke with 'sort -txx'. Complain about -@@ -4502,9 +5190,12 @@ main (int argc, char **argv) +@@ -4500,9 +5187,12 @@ main (int argc, char **argv) quote (optarg)); } } -- 1.8.3.1

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

devel January 2018