Date: Sunday, September 15, 2013 @ 15:12:40 Author: allan Revision: 194391
fix conflict Added: glibc/repos/testing-i686/ glibc/repos/testing-i686/PKGBUILD (from rev 194390, glibc/trunk/PKGBUILD) glibc/repos/testing-i686/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch (from rev 194390, glibc/trunk/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch) glibc/repos/testing-i686/glibc-2.18-readdir_r-CVE-2013-4237.patch (from rev 194390, glibc/trunk/glibc-2.18-readdir_r-CVE-2013-4237.patch) glibc/repos/testing-i686/glibc-2.18-strcoll-CVE-2012-4412+4424.patch (from rev 194390, glibc/trunk/glibc-2.18-strcoll-CVE-2012-4412+4424.patch) glibc/repos/testing-i686/glibc-2.18-strstr-hackfix.patch (from rev 194390, glibc/trunk/glibc-2.18-strstr-hackfix.patch) glibc/repos/testing-i686/glibc.install (from rev 194390, glibc/trunk/glibc.install) glibc/repos/testing-i686/locale-gen (from rev 194390, glibc/trunk/locale-gen) glibc/repos/testing-i686/locale.gen.txt (from rev 194390, glibc/trunk/locale.gen.txt) glibc/repos/testing-i686/nscd.service (from rev 194390, glibc/trunk/nscd.service) glibc/repos/testing-i686/nscd.tmpfiles (from rev 194390, glibc/trunk/nscd.tmpfiles) glibc/repos/testing-x86_64/ glibc/repos/testing-x86_64/PKGBUILD (from rev 194390, glibc/trunk/PKGBUILD) glibc/repos/testing-x86_64/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch (from rev 194390, glibc/trunk/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch) glibc/repos/testing-x86_64/glibc-2.18-readdir_r-CVE-2013-4237.patch (from rev 194390, glibc/trunk/glibc-2.18-readdir_r-CVE-2013-4237.patch) glibc/repos/testing-x86_64/glibc-2.18-strcoll-CVE-2012-4412+4424.patch (from rev 194390, glibc/trunk/glibc-2.18-strcoll-CVE-2012-4412+4424.patch) glibc/repos/testing-x86_64/glibc-2.18-strstr-hackfix.patch (from rev 194390, glibc/trunk/glibc-2.18-strstr-hackfix.patch) glibc/repos/testing-x86_64/glibc.install (from rev 194390, glibc/trunk/glibc.install) glibc/repos/testing-x86_64/locale-gen (from rev 194390, glibc/trunk/locale-gen) glibc/repos/testing-x86_64/locale.gen.txt (from rev 194390, glibc/trunk/locale.gen.txt) glibc/repos/testing-x86_64/nscd.service (from rev 194390, glibc/trunk/nscd.service) glibc/repos/testing-x86_64/nscd.tmpfiles (from rev 194390, glibc/trunk/nscd.tmpfiles) Deleted: glibc/repos/testing-i686/PKGBUILD glibc/repos/testing-i686/glibc-2.18-readdir_r-CVE-2013-4237.patch glibc/repos/testing-i686/glibc-2.18-strstr-hackfix.patch glibc/repos/testing-i686/glibc.install glibc/repos/testing-i686/locale-gen glibc/repos/testing-i686/locale.gen.txt glibc/repos/testing-i686/nscd.service glibc/repos/testing-i686/nscd.tmpfiles glibc/repos/testing-x86_64/PKGBUILD glibc/repos/testing-x86_64/glibc-2.18-readdir_r-CVE-2013-4237.patch glibc/repos/testing-x86_64/glibc-2.18-strstr-hackfix.patch glibc/repos/testing-x86_64/glibc.install glibc/repos/testing-x86_64/locale-gen glibc/repos/testing-x86_64/locale.gen.txt glibc/repos/testing-x86_64/nscd.service glibc/repos/testing-x86_64/nscd.tmpfiles --------------------------------------------------------------+ /PKGBUILD | 318 +++ /glibc-2.18-readdir_r-CVE-2013-4237.patch | 562 +++++ /glibc-2.18-strstr-hackfix.patch | 26 /glibc.install | 38 /locale-gen | 84 /locale.gen.txt | 46 /nscd.service | 36 /nscd.tmpfiles | 8 testing-i686/PKGBUILD | 148 - testing-i686/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch | 54 testing-i686/glibc-2.18-readdir_r-CVE-2013-4237.patch | 281 -- testing-i686/glibc-2.18-strcoll-CVE-2012-4412+4424.patch | 1004 ++++++++++ testing-i686/glibc-2.18-strstr-hackfix.patch | 13 testing-i686/glibc.install | 19 testing-i686/locale-gen | 42 testing-i686/locale.gen.txt | 23 testing-i686/nscd.service | 18 testing-i686/nscd.tmpfiles | 4 testing-x86_64/PKGBUILD | 148 - testing-x86_64/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch | 54 testing-x86_64/glibc-2.18-readdir_r-CVE-2013-4237.patch | 281 -- testing-x86_64/glibc-2.18-strcoll-CVE-2012-4412+4424.patch | 1004 ++++++++++ testing-x86_64/glibc-2.18-strstr-hackfix.patch | 13 testing-x86_64/glibc.install | 19 testing-x86_64/locale-gen | 42 testing-x86_64/locale.gen.txt | 23 testing-x86_64/nscd.service | 18 testing-x86_64/nscd.tmpfiles | 4 28 files changed, 3234 insertions(+), 1096 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 194390:194391 to see the changes.