March 2016 - openSUSE Commits - openSUSE Mailing Lists

commit mailman for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '16

31 Mar '16

Hello community, here is the log from the commit of package mailman for openSUSE:Factory checked in at 2016-03-31 13:03:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mailman (Old) and /work/SRC/openSUSE:Factory/.mailman.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mailman" Changes: -------- --- /work/SRC/openSUSE:Factory/mailman/mailman.changes 2015-04-02 16:04:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mailman.new/mailman.changes 2016-03-31 13:03:34.000000000 +0200 @@ -1,0 +2,24 @@ +Tue Mar 29 13:50:00 UTC 2016 - hsk(a)imb-jena.de + +- updated mailman-apache2.conf to support "require" syntax of recent + apache httpd + +------------------------------------------------------------------- +Mon Feb 29 12:50:00 UTC 2016 - hsk(a)imb-jena.de + +- update to 2.1.21 + * new dmarc_none_moderation_action list setting + * new feature to automatically turn on moderation for single list + members (spam prevention) + * new mm_cfg.py setting GLOBAL_BAN_LIST + * translation updates and bug fixes + * for more details see NEWS and Mailman/Defaults.py +- mailman-2.1.4-dirmode.patch: adjusted to 2.1.21 + +------------------------------------------------------------------- +Wed Feb 3 09:15:45 UTC 2016 - mpluskal(a)suse.com + +- Use url for source +- Add gpg signature + +------------------------------------------------------------------- Old: ---- mailman-2.1.20.tgz New: ---- mailman-2.1.21.tgz mailman-2.1.21.tgz.sig mailman.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mailman.spec ++++++ --- /var/tmp/diff_new_pack.1dNUUy/_old 2016-03-31 13:03:35.000000000 +0200 +++ /var/tmp/diff_new_pack.1dNUUy/_new 2016-03-31 13:03:35.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package mailman # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,9 +37,11 @@ Summary: The GNU Mailing List Manager License: GPL-2.0+ Group: Productivity/Networking/Email/Mailinglists -Version: 2.1.20 +Version: 2.1.21 Release: 0 -Source: %{name}-%{version}.tgz +Source0: https://ftp.gnu.org/gnu/mailman/%{name}-%{version}.tgz +Source13: https://ftp.gnu.org/gnu/mailman/%{name}-%{version}.tgz.sig +Source14: %{name}.keyring Source1: README.SUSE Source2: mailman-2.1-manpages.tgz %if %DISTRIBUTABLE ++++++ mailman-2.1.20.tgz -> mailman-2.1.21.tgz ++++++ /work/SRC/openSUSE:Factory/mailman/mailman-2.1.20.tgz /work/SRC/openSUSE:Factory/.mailman.new/mailman-2.1.21.tgz differ: char 5, line 1 ++++++ mailman-2.1.4-dirmode.patch ++++++ --- /var/tmp/diff_new_pack.1dNUUy/_old 2016-03-31 13:03:35.000000000 +0200 +++ /var/tmp/diff_new_pack.1dNUUy/_new 2016-03-31 13:03:35.000000000 +0200 @@ -30,7 +30,7 @@ ARTICLEFILEPERMS = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP @@ -174,8 +175,7 @@ prefix = mm_cfg.PREFIX - print _('checking mode for %(prefix)s') + print C_('checking mode for %(prefix)s') dirs = {} - for d in (mm_cfg.PREFIX, mm_cfg.EXEC_PREFIX, mm_cfg.VAR_PREFIX, - mm_cfg.LOG_DIR): @@ -40,31 +40,31 @@ try: @@ -184,14 +184,24 @@ if e.errno <> errno.ENOENT: raise - print _('WARNING: directory does not exist: %(d)s') + print C_('WARNING: directory does not exist: %(d)s') continue - if (mode & DIRPERMS) <> DIRPERMS: - STATE.ERRORS += 1 -- print _('directory must be at least 02775: %(d)s'), +- print C_('directory must be at least 02775: %(d)s'), - if STATE.FIX: -- print _('(fixing)') +- print C_('(fixing)') - os.chmod(d, mode | DIRPERMS) - else: - print + if (d == mm_cfg.VAR_PREFIX): + if (mode & DIRPERMS_VAR) <> DIRPERMS_VAR: + STATE.ERRORS += 1 -+ print _('directory must be 02755: %(d)s'), ++ print C_('directory must be 02755: %(d)s'), + if STATE.FIX: -+ print _('(fixing)') ++ print C_('(fixing)') + os.chmod(d, mode | DIRPERMS_VAR) + else: + print + else: + if (mode & DIRPERMS) <> DIRPERMS: + STATE.ERRORS += 1 -+ print _('directory must be at least 02775: %(d)s'), ++ print C_('directory must be at least 02775: %(d)s'), + if STATE.FIX: -+ print _('(fixing)') ++ print C_('(fixing)') + os.chmod(d, mode | DIRPERMS) + else: + print ++++++ mailman-apache2.conf ++++++ --- /var/tmp/diff_new_pack.1dNUUy/_old 2016-03-31 13:03:35.000000000 +0200 +++ /var/tmp/diff_new_pack.1dNUUy/_new 2016-03-31 13:03:35.000000000 +0200 @@ -11,19 +11,35 @@ Alias /pipermail/ /var/lib/mailman/archives/public/ <Directory /usr/lib/mailman/cgi-bin> - order allow,deny - allow from all + <IfModule !mod_access_compat.c> + require all granted + </IfModule> + <IfModule mod_access_compat.c> + order allow,deny + allow from all + </IfModule> </Directory> <Directory /usr/lib/mailman/icons> - order allow,deny - allow from all + <IfModule !mod_access_compat.c> + require all granted + </IfModule> + <IfModule mod_access_compat.c> + order allow,deny + allow from all + </IfModule> </Directory> + <Directory /var/lib/mailman/archives/> Options +FollowSymLinks - order allow,deny - allow from all + <IfModule !mod_access_compat.c> + require all granted + </IfModule> + <IfModule mod_access_compat.c> + order allow,deny + allow from all + </IfModule> </Directory> </IfDefine>

1 0

commit gnu_parallel for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '16

31 Mar '16

Hello community, here is the log from the commit of package gnu_parallel for openSUSE:Factory checked in at 2016-03-31 13:03:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnu_parallel (Old) and /work/SRC/openSUSE:Factory/.gnu_parallel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnu_parallel" Changes: -------- --- /work/SRC/openSUSE:Factory/gnu_parallel/gnu_parallel.changes 2016-02-26 00:31:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnu_parallel.new/gnu_parallel.changes 2016-03-31 13:03:29.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Mar 22 22:05:36 UTC 2016 - jengelh(a)inai.de + +- Update to new upstream release 20160322 +* env_parallel is a function that exports the environment + (functions, aliases, variables, and arrays) to GNU Parallel. +* niceload --prg now searches for substrings if no process with the + name is found. + +------------------------------------------------------------------- Old: ---- parallel-20160222.tar.bz2 parallel-20160222.tar.bz2.sig New: ---- parallel-20160322.tar.bz2 parallel-20160322.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnu_parallel.spec ++++++ --- /var/tmp/diff_new_pack.akkDOe/_old 2016-03-31 13:03:30.000000000 +0200 +++ /var/tmp/diff_new_pack.akkDOe/_new 2016-03-31 13:03:30.000000000 +0200 @@ -17,7 +17,7 @@ Name: gnu_parallel -Version: 20160222 +Version: 20160322 Release: 0 Summary: Shell tool for executing jobs in parallel License: GPL-3.0+ @@ -61,6 +61,7 @@ %files %defattr(-,root,root) +%_bindir/env_parallel* %_bindir/niceload %_bindir/parallel %_bindir/sem ++++++ parallel-20160222.tar.bz2 -> parallel-20160322.tar.bz2 ++++++ ++++ 4839 lines of diff (skipped) ++++++ parallel-20160222.tar.bz2.sig -> parallel-20160322.tar.bz2.sig ++++++ --- /work/SRC/openSUSE:Factory/gnu_parallel/parallel-20160222.tar.bz2.sig 2016-02-26 00:31:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnu_parallel.new/parallel-20160322.tar.bz2.sig 2016-03-31 13:03:29.000000000 +0200 @@ -2,7 +2,7 @@ # To check the signature run: # echo | gpg -# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20160222.tar.bz2.sig +# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20160322.tar.bz2.sig echo | gpg 2>/dev/null gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve $0 @@ -11,32 +11,32 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 -iQTwBAABCgAGBQJWyjQHAAoJENGrRRaIiIiIdbkmoKS4CkGHn6LJrlpiA5ZZHFZt -ilqSesENZ79xI+fLoVofagqs49e6uiQaWPPydCe+Izzpn0K4gzfeXq0Xtpp+22Z8 -wzQXHyGozZPfXPAtaGTiFdHV8jp/rclCgW8plNUYuawYl0satdvJCHkI0sqqeXoT -rGu3sOgjFaUoshRDkz1WQNao2XOPIcPV3C5mxxxL95LX+q47lhQO7XWAxPuw8063 -xYedef1mTIz27jFUgo58PfT+d0v3g9avpzponBIrQJb7nR4sYn6X3tJEpxBGmrGa -5nTfO314PIRZQlJMVHQN2+NSoPm7852dpBNh9Ym5Yq1A794tU3xbaa9i7gRN+yDC -JXkgjiuRKFln4Ld2udIcGQOBjETBGj7kaD1jA+gBYa4MIp7TnFxwA4AOBaOlgh8R -e5wATI6DWbWkG9Jtme2GSJD5V34StSO2DErQb5LEuVdtH2mGfNAIGB9x+a7w0PlL -HEdJ2iLftPYQrorotO+LZCRaDSMWW6irGqirFiUKERhmGZKttkukd/DjKF0lkmw6 -wAWkYCA5vZKw0jbjRLmrP5CVnBkyfPGyKWWpWU4D8AgsMh7VSt8ANcpztib8Y3wP -MkvxAEv29/ZS09WdEyaNxNEy40cdfw2YLObUvInOixf/SSWkA+Ler/mHUNCNJmYh -H/bTYiu0BneDq3mppgri0M4784SG4+QBbgW339OBXN85OqTWNPYaW/4xeevCp9US -0eplmUZVD4uqBPx/Rz+YdAFBbcACKn+y9TGPE9mf9fTT8pcW3hhiQA++UXWZE9T5 -/5L87kF+TSljwnG6ziP5rnTD4kPJtQDdROe0sxyLvmjFAsg99xMSNF6rvKX9eXDd -l1PQf+LF6pa/b35TO/hwvVSMdaWHf0wMl1Ph2ULUR+0JRXMSfnywLD85e0N/qUNi -syoXasWfIIm963aD8VwBTnh5AIcOP2AaZ9gDe+a4qEXrRlAcAoARASEKTtY5OPY1 -/vk7A9Rb3w39hrElX610I2g8FwmkD7GOPrdaF5alghqz97XsVehlDns3lZyAEL1f -zlXNKNva76xzKNmW+FEozDHYQhNIYJ7/tOfVwqKOpG6qckZanLhkWOAfgTKyIbTW -2BzciywZyAbuHIwD2zDkP/kjOz0JxUnD3qw1ZyffBYqCVynbDCwhpfAiE6imUaOc -xvz2RhCZtS/9IFWNOSQMGtHeUdM+4JOGQBVgsfrDUgT4uazHvTEwitV+8flGwIP3 -nUEgvNo1IX23t1hyvOMbhoQg2EA+qMnlF5jQOAW6uwbaYvLCzgXXPeH/vHoTDkmA -BGQRpg60IpdvihhIK3DY/bG/BFCQ6CyIyogsGBHw76yXALa4C7I9OngtiQA9R2Fl -ovfR93TyqIzDHb3M+HDdAKYQ5go1gxMpP1Sv02Q/K9SjsFzTKnbtSEsuNn/GtThK -0gAnpHQGKN5wCWFA0xoLH/OHaN1dDBwCPm0lYYvtpo3KZvFxTUNwQ5R0zSpQ/4Vv -Sdut46mEsGc18PxY39YBQGT6CRgIURzMKvz+SoYQ4dyW6G46ciDaX7Xs/5C6QtE+ -DHx0MPkPft7WVosAJmQ2QmA3Ph7VH6Sbkf5NnuAdmhh0rXH0/tM0gowVa0pJOrfF -Hbw2JllrQA8tLKBnf0mA2dQJAg== -=yMZD +iQTwBAABCgAGBQJW8aS/AAoJENGrRRaIiIiITKEmn1PN+74+Ojeq3SIe6W2PK0a1 +VoqdfAraZwSavHpcWFFwLVisYmVHROiLDxVr1msfkp0alD4h/Bsu75vIc/8e5UV3 +SyoqHJi9bb5qq1ZwJz9EC++jmms76Tow8MOnkv9nc9836I6b1YdoKXwpU/MVtf22 +rf+OYzIL4WuBxjoZn9ruuKkwgbsm/sQSsi4GrD0FB/Lsydl7N0/qtYwGqniXE2ZS +SwX42nCKpIH0KDNFxmfn7UsWN4TS/x/h5av9xjeI8IY9qGaZwZyaX7ce0QwAs1pS +JS34cr85VDzylEYM8GXePSrehNdlBOsbB0ED2p/4VlKgNNy0tvtm4s5ddkXc5dDJ +qUu+2T9IS9ydVJ0FpFI7WZwOX97DbPQIXDQRRprOf93BXYrDXgjsXpNBBERAS8yD +JtcxXnMUSgWV4a7XnvZ11r4k4j44QoYJP2QuS+lms5fVVlulaCtUAMvhtY7XEhtw +pI0pjz9Dfmm7U72EhG+Zoh+w8S2gU9wV0G2cs05YuSUEQvFNN7JqNcJdBfeb+hwk +QQI2dWEiucvNN/y7p+NGZk+/jqWro3IGYfmieoXS5CTKyB+bWlkq31uxQhmA5SDv +8rF2YIq1HpuVEBm2T5Q4m7n1mVTxocG2pat/pVC0XSYsPgWpYxeTX+970p0q+y4Y +Krn+3olqISVHciOOi0YCio0YsLTdp/KQ5VtPJYq5ST1yEvlkSU6+tYgkIb9YU/tX +iydSswg5C6vg2FxE7+QB7LN65xqBccwCLMt/ekzKqFoH/4X9jAOsx3cKWVdk3E6B +mdxSi1ChHpqUg8F0bOKR/CaykOBhdIkC9kJfM446hhQCrQRB95M38q03dnddIiQh +ztXS7Z+B+abuv2SBqJMVTQEZwOFnl6NJFaO02coxR6vUDDGC9PUx1lV/o+zqPgZC +Mbf2CFOLI0fhLMm7ZbLggBPjSXxTfRu5zfV0G7uXIDnh7Gwi7b4+mf/HeHfGBds/ +q0MTkHNwl+Q+a/nXd+0BUanRBJ/7uN8idI+SzSp0e+cbq9Tp4Kz60P1v7ECxk/TX +mrJTRgvSgD6aQvd+PkdsBBARO10KHW8FxAc7+9jUh9UChOYoQUlafs6c5u4mIJo+ +0pqqq7TBzQB2YbixYrIZ02yZl3MWyu2rjT9f9VmQFPp+ZSu7Qwe9NpiRttOev/Jp +fxwwSSBCxPPEPI79DhW79fXllKb6YSjXFh2TfrtW8FJeib/H+eY/hykVgsmFzsam +mJ/4RwsdWAxomWUrD8rkcuxFdWSsaE8WhaGROKKsPgDOybp7I8iQH0y2hAxbBucg +iCCh28ubuuSfKY8kpgC7q0SYEEzl7d9CSEGCxCtzTa3MY0XeaPXvjXG3VXCh9qXl +agcekDsoiWUWgvmIa+V5sUpdYwQKwkoR8OSlu4KMs9QjkNLxgUrsaEDnaUTjRA3O +sS/QjrZdZbLS262f0E0NeEI2ft9LVRt+cydfCws/P+vgkOxku8m1cncxlBsXsxXj +C6xsjRwsFvQSOyV6BShMmR4vm8DsYeC4M2XqUaZwt11+96AYAskIeeShDq8LKKaW +s+zWDnuY1GcvUroxTChI5Qh1+zNSv0w3vnZr/PQ6qVxIRv94l5B47Y5FjcEuCxA9 +BEAExmR8ns7qai+/s2kMXvkHWg== +=X2Qh -----END PGP SIGNATURE-----

1 0

commit mkvtoolnix for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '16

31 Mar '16

Hello community, here is the log from the commit of package mkvtoolnix for openSUSE:Factory checked in at 2016-03-31 13:03:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkvtoolnix (Old) and /work/SRC/openSUSE:Factory/.mkvtoolnix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mkvtoolnix" Changes: -------- --- /work/SRC/openSUSE:Factory/mkvtoolnix/mkvtoolnix.changes 2016-01-12 16:13:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mkvtoolnix.new/mkvtoolnix.changes 2016-03-31 13:03:26.000000000 +0200 @@ -1,0 +2,47 @@ +Mon Mar 28 23:06:54 UTC 2016 - rpm(a)fthiessen.de + +- Update to new upstream release 9.0.1: +* mkvmerge: bug fix: regression in v9.0.0: the text subtitle + packetizer was wrongfully assuming an encoding of UTF-8 if none + was given instead of assuming the system's encoding. Fixes #1639. + bug fix: if too many chapters had been generated with + --generate-chapters then mkvmerge created a bogus entry in the + meta seek element and did not actually write the chapters to the + file. + bug fix: the DTS packetizer was setting the number of + channels wrong sometimes when reducing to the DTS core. It was + using the number of channels including the extensions instead of + the channels of the core only. + +------------------------------------------------------------------- +Mon Mar 28 10:22:11 UTC 2016 - jengelh(a)inai.de + +- Update to new upstream release 9.0.0 +* mkvmerge: bug fix: fixed two more issues in the conversion of + teletext subtitles to SRT subtitles. +* mkvmerge: MP4/QuickTime reader: audio tracks with the FourCC + "lpcm" are muxed as A_PCM/INT/LIT instead of A_QUICKTIME. +* mkvmerge: bug fix: MP4/QuickTime reader: audio tracks can contain + two instances of certain header fields in the STSD atom; + mkvmerge now uses the v2 structure over v0, if present. +* mkvextract: new feature: implemented the extraction of Big + Endian PCM (codec ID A_PCM/INT/BIG) to WAV files. The content will + be byte-swapped into Little Endian PCM in the process. +* mkvmerge: enhancement: Big Endian PCM tracks will now be + byte-swapped into Little Endian PCM, and the codec ID + A_PCM/INT/LIT will be used, as many players do not support BE PCM + inside MKVs. + +------------------------------------------------------------------- +Mon Feb 22 18:27:27 UTC 2016 - jengelh(a)inai.de + +- Update to new upstream release 8.9.0 +* gui: the default font size adjustment has been. Deactivated for + the time being as it causes problems on high DPI Displays. +* gui: ampersands in file names were shown as keyboard shortcuts + in tab titles in various tools +* gui: add ability (menu entry) for removing chapters from an + existing Matroska file. +* Polish translation provided + +------------------------------------------------------------------- Old: ---- mkvtoolnix-8.8.0.tar.xz New: ---- mkvtoolnix-9.0.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkvtoolnix.spec ++++++ --- /var/tmp/diff_new_pack.JDQQtX/_old 2016-03-31 13:03:27.000000000 +0200 +++ /var/tmp/diff_new_pack.JDQQtX/_new 2016-03-31 13:03:27.000000000 +0200 @@ -17,14 +17,13 @@ Name: mkvtoolnix -Version: 8.8.0 +Version: 9.0.1 Release: 0 Summary: Tools to Create, Alter, and Inspect Matroska Files License: GPL-2.0+ Group: Productivity/Multimedia/Other Url: http://bunkus.org/videotools/mkvtoolnix/ -#Git-Web: http://github.com/mbunkus/mkvtoolnix -#Git-Clone: git://github.com/mbunkus/mkvtoolnix +#Git: http://github.com/mbunkus/mkvtoolnix Source: https://mkvtoolnix.download/sources/mkvtoolnix-%{version}.tar.xz # PATCH-OPENSUSE-FIX disable-update-check.patch -- Disable default update check Patch0: disable-update-check.patch @@ -112,17 +111,27 @@ %doc %lang(ja) %{_mandir}/ja/man1/mkvextract.1%{ext_man} %doc %lang(ja) %{_mandir}/ja/man1/mkvmerge.1%{ext_man} %doc %lang(ja) %{_mandir}/ja/man1/mkvpropedit.1%{ext_man} +%doc %lang(ko) %{_mandir}/ko/man1/mkvextract.1%{ext_man} +%doc %lang(ko) %{_mandir}/ko/man1/mkvmerge.1%{ext_man} +%doc %lang(ko) %{_mandir}/ko/man1/mkvpropedit.1%{ext_man} %doc %lang(nl) %{_mandir}/nl/man1/mkvextract.1%{ext_man} %doc %lang(nl) %{_mandir}/nl/man1/mkvmerge.1%{ext_man} %doc %lang(nl) %{_mandir}/nl/man1/mkvpropedit.1%{ext_man} +%doc %lang(pl) %{_mandir}/pl/man1/mkvextract.1%{ext_man} +%doc %lang(pl) %{_mandir}/pl/man1/mkvmerge.1%{ext_man} +%doc %lang(pl) %{_mandir}/pl/man1/mkvpropedit.1%{ext_man} %doc %lang(uk) %{_mandir}/uk/man1/mkvextract.1%{ext_man} %doc %lang(uk) %{_mandir}/uk/man1/mkvmerge.1%{ext_man} %doc %lang(uk) %{_mandir}/uk/man1/mkvpropedit.1%{ext_man} %doc %lang(zh_CN) %{_mandir}/zh_CN/man1/mkvextract.1%{ext_man} %doc %lang(zh_CN) %{_mandir}/zh_CN/man1/mkvmerge.1%{ext_man} %doc %lang(zh_CN) %{_mandir}/zh_CN/man1/mkvpropedit.1%{ext_man} +%doc %lang(ko) %dir %{_mandir}/ko +%doc %lang(ko) %dir %{_mandir}/ko/man1 %doc %lang(nl) %dir %{_mandir}/nl %doc %lang(nl) %dir %{_mandir}/nl/man1 +%doc %lang(pl) %dir %{_mandir}/pl +%doc %lang(pl) %dir %{_mandir}/pl/man1 %doc %lang(uk) %dir %{_mandir}/uk %doc %lang(uk) %dir %{_mandir}/uk/man1 %doc %lang(zh_CN) %dir %{_mandir}/zh_CN @@ -150,10 +159,14 @@ %doc %lang(es) %{_mandir}/es/man1/mkvtoolnix-gui.1%{ext_man} %doc %lang(ja) %{_mandir}/ja/man1/mkvinfo.1%{ext_man} %doc %lang(ja) %{_mandir}/ja/man1/mkvtoolnix-gui.1%{ext_man} +%doc %lang(ko) %{_mandir}/ko/man1/mkvinfo.1%{ext_man} +%doc %lang(ko) %{_mandir}/ko/man1/mkvtoolnix-gui.1%{ext_man} %doc %lang(uk) %{_mandir}/uk/man1/mkvinfo.1%{ext_man} %doc %lang(uk) %{_mandir}/uk/man1/mkvtoolnix-gui.1%{ext_man} %doc %lang(nl) %{_mandir}/nl/man1/mkvinfo.1%{ext_man} %doc %lang(nl) %{_mandir}/nl/man1/mkvtoolnix-gui.1%{ext_man} +%doc %lang(pl) %{_mandir}/pl/man1/mkvinfo.1%{ext_man} +%doc %lang(pl) %{_mandir}/pl/man1/mkvtoolnix-gui.1%{ext_man} %doc %lang(zh_CN) %{_mandir}/zh_CN/man1/mkvinfo.1%{ext_man} %doc %lang(zh_CN) %{_mandir}/zh_CN/man1/mkvtoolnix-gui.1%{ext_man} ++++++ mkvtoolnix-8.8.0.tar.xz -> mkvtoolnix-9.0.1.tar.xz ++++++ ++++ 349469 lines of diff (skipped)

1 0

commit docker for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '16

31 Mar '16

Hello community, here is the log from the commit of package docker for openSUSE:Factory checked in at 2016-03-31 13:03:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker (Old) and /work/SRC/openSUSE:Factory/.docker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "docker" Changes: -------- --- /work/SRC/openSUSE:Factory/docker/docker.changes 2016-01-01 19:50:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.docker.new/docker.changes 2016-03-31 13:03:23.000000000 +0200 @@ -0,0 +1,221 @@ +------------------------------------------------------------------- +Tue Mar 22 15:27:26 UTC 2016 - fcastelli(a)suse.com + +- Changed systemd unit file and default sysconfig file to include network options, + this is needed to get SDN like flannel to work + +------------------------------------------------------------------- +Tue Mar 15 09:16:55 UTC 2016 - asarai(a)suse.de + +- docker.spec: update warning to mention that /etc/sysconfig/docker is sourced + by the migration script. + +------------------------------------------------------------------- +Mon Mar 14 10:20:19 UTC 2016 - asarai(a)suse.de + +- docker.spec: only Reccomends: the docker-image-migrator package as it is no + longer required for our ugly systemctl hacks. +- docker.spec: fix up documentation to refer to the script you need to run in + the migrator package. +- docker.spec: print a warning if you force the DOCKER_FORCE_INSTALL option. + +------------------------------------------------------------------- +Fri Mar 11 08:44:46 UTC 2016 - asarai(a)suse.de + +- spec: switch to new done file name from docker-image-migrator + +------------------------------------------------------------------- +Fri Mar 11 08:41:49 UTC 2016 - jmassaguerpla(a)suse.com + +- update to docker 1.10.3 (bnc#970637) + Runtime + Fix Docker client exiting with an "Unrecognized input header" error #20706 + Fix Docker exiting if Exec is started with both AttachStdin and Detach #20647 + Distribution + Fix a crash when pushing multiple images sharing the same layers to the same repository in parallel #20831 + Fix a panic when pushing images to a registry which uses a misconfigured token service #21030 + Plugin system + Fix issue preventing volume plugins to start when SELinux is enabled #20834 + Prevent Docker from exiting if a volume plugin returns a null response for Get requests #20682 + Fix plugin system leaking file descriptors if a plugin has an error #20680 + Security + Fix linux32 emulation to fail during docker build #20672 It was due to the personality syscall being blocked by the default seccomp profile. + Fix Oracle XE 10g failing to start in a container #20981 It was due to the ipc syscall being blocked by the default seccomp profile. + Fix user namespaces not working on Linux From Scratch #20685 + Fix issue preventing daemon to start if userns is enabled and the subuid or subgid files contain comments #20725 + + More at https://github.com/docker/docker/releases/tag/v1.10.3 + +------------------------------------------------------------------- +Thu Mar 10 13:52:54 UTC 2016 - asarai(a)suse.de + +- spec: improve file-based migration checks to make sure that it doesn't cause + errors if running on a /var/lib/docker without /var/lib/docker/graph. + +------------------------------------------------------------------- +Wed Mar 9 13:45:14 UTC 2016 - asarai(a)suse.de + +- spec: implement file-based migration checks. The migrator will be updated to + match the warning message's instructions. This looks like it works with my + testing. + +------------------------------------------------------------------- +Mon Mar 7 14:09:17 UTC 2016 - normand(a)linux.vnet.ibm.com + +- more patches to build on ppc64 architecture + update netlink_gcc_go.patch + new netlink_netns_powerpc.patch + new boltdb_bolt_powerpc.patch + new libnetwork_drivers_bridge_powerpc.patch to replace + deleted fix-ppc64le.patch + +------------------------------------------------------------------- +Tue Mar 1 17:54:41 UTC 2016 - jmassaguerpla(a)suse.com + +- fix bsc#968972 - let docker manage the cgroups of the processes + that it launches without systemd + +------------------------------------------------------------------- +Tue Mar 1 15:28:56 UTC 2016 - jmassaguerpla(a)suse.com + +- Require docker-image-migrator (bnc#968933) + +------------------------------------------------------------------- +Tue Feb 23 08:55:17 UTC 2016 - jmassaguerpla(a)suse.com + +Update to version 1.10.2 (bnc#968933) + + - Runtime + Prevent systemd from deleting containers' cgroups when its configuration is reloaded #20518 + Fix SELinux issues by disregarding --read-only when mounting /dev/mqueue #20333 + Fix chown permissions used during docker cp when userns is used #20446 + Fix configuration loading issue with all booleans defaulting to true #20471 + Fix occasional panic with docker logs -f #20522 + + - Distribution + Keep layer reference if deletion failed to avoid a badly inconsistent state #20513 + Handle gracefully a corner case when canceling migration #20372 + Fix docker import on compressed data #20367 + Fix tar-split files corruption during migration that later cause docker push and docker save to fail #20458 + + - Networking + Fix daemon crash if embedded DNS is sent garbage #20510 + + - Volumes + Fix issue with multiple volume references with same name #20381 + + - Security + Fix potential cache corruption and delegation conflict issues #20523 + +link to changelog: + +https://github.com/docker/docker/blob/v1.10.2/CHANGELOG.md + +------------------------------------------------------------------- +Mon Feb 15 09:48:41 UTC 2016 - asarai(a)suse.com + +- fix-apparmor.patch: switch to a backported version of docker/docker#20305, + which also fixes several potential issues if the major version of apparmor + changes. + +------------------------------------------------------------------- +Mon Feb 15 08:35:43 UTC 2016 - asarai(a)suse.com + +- Remove 1.10.0 tarball. + +------------------------------------------------------------------- +Fri Feb 12 16:04:19 UTC 2016 - jmassaguerpla(a)suse.com + +- Update to docker 1.10.1 + It includes some fixes to 1.10.0, see detailed changelog in + +https://github.com/docker/docker/blob/v1.10.1/CHANGELOG.md + +------------------------------------------------------------------- +Tue Feb 9 17:24:46 UTC 2016 - jmassaguerpla(a)suse.com + +- Update docker to 1.10.0 (bnc#965918) + + Add usernamespace support + Add support for custom seccomp profiles + Improvements in network and volume management + +detailed changelog in + +https://github.com/docker/docker/blob/590d5108bbdaabb05af590f76c9757daceb6d02e/CHANGELOG.md + +- removed patches, because code has been merged in 1.10.0 release: + libcontainer-apparmor-fixes.patch: see: https://github.com/docker/docker/blob/release/v1.10/contrib/apparmor/templa… + fix_bnc_958255.patch: see https://github.com/docker/docker/commit/2b4f64e59018c21aacbf311d5c774dd5521… + use_fs_cgroups_by_default.patch + fix_cgroup.parent_path_sanitisation.patch + add_bolt_ppc64.patch + add_bolt_arm64.patch + add_bolt_s390x.patch + +- remove gcc-go-build-static-libgo.patch: This has been replace by gcc-go-patches.patch + +- removed patches, because arm and ppc are not build using the dynbinary target, but the dyngccgo one: + docker_remove_journald_to_fix_dynbinary_build_on_arm.patch + docker_remove_journald_to_fix_dynbinary_build_on_powerpc.patch + docker_remove_journald_to_fix_dynbinary_build_on_arm64.patch + +- added patches: + fix_platform_type_arm.patch: fix build for arm64 and aarch64: set utsname as uint8 for arm64 and aarch64 + gcc5_socket_workaround.patch: gcc5-go in Tumbleweed includes this commit + https://github.com/golang/gofrontend/commit/a850225433a66a58613c22185c3b096… + Which "fixes" the data type for RawSockaddr.Data + However, docker now expects the "wrong" data type, since docker had a workaround + for that issue. + Thus, we need to workaround the workaround in tumbleweed + netlink_gcc_go.patch: add constants for syscalls TUNSETIFF and TUNSETPERSIST to fix a gcc issue. + This is a workaround for bnc#964468: gcc-go can no longer compile Docker. + fix-apparmor.patch: fix https://github.com/docker/docker/issues/20269 . It affects SLE12 which has apparmor + version 2.8 and not openSUSE which has version 2.9. + fix-ppc64le.patch: Build netlink driver using int8 and not uint8 for the data structure + + +- reviewed patches: + ignore-dockerinit-checksum.patch: review context in patch + fix-docker-init.patch: review patch because build method has been changed in spec file for gcc-go + gcc-go-patches.patch: review context in patch + +- Build requires go >= 1.5: For version 1.9, we could use Go 1.4.3 + see GO_VERSION https://github.com/docker/docker/blob/release/v1.9/Dockerfile + However, for version 1.10, we need go 1.5.3 + see GO_VERSION https://github.com/docker/docker/blob/release/v1.10/Dockerfile + +- fix bnc#965600 - SLES12 SP1 - Static shared memory limit in container + + +------------------------------------------------------------------- +Wed Jan 27 23:40:09 UTC 2016 - asarai(a)suse.com + +- backport 1 bugfix from the upstream 1.10 branch + Added: + fix_json_econnreset_bug.patch (https://github.com/docker/docker/issues/14203) + ++++ 24 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/docker/docker.changes ++++ and /work/SRC/openSUSE:Factory/.docker.new/docker.changes Old: ---- add_bolt_arm64.patch add_bolt_ppc64.patch docker-1.9.1.tar.xz docker_remove_journald_to_fix_dynbinary_build_on_arm.patch docker_remove_journald_to_fix_dynbinary_build_on_arm64.patch docker_remove_journald_to_fix_dynbinary_build_on_powerpc.patch gcc-go-build-static-libgo.patch libcontainer-apparmor-fixes.patch New: ---- boltdb_bolt_powerpc.patch docker-1.10.3.tar.xz fix-apparmor.patch fix_platform_type_arm.patch gcc-go-patches.patch gcc5_socket_workaround.patch libnetwork_drivers_bridge_powerpc.patch netlink_gcc_go.patch netlink_netns_powerpc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker.spec ++++++ --- /var/tmp/diff_new_pack.xfQW4h/_old 2016-03-31 13:03:25.000000000 +0200 +++ /var/tmp/diff_new_pack.xfQW4h/_new 2016-03-31 13:03:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package docker # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,14 @@ # -%define git_version a34a1d5 +%define docker_store /var/lib/docker +%define docker_graph %{docker_store}/graph +%define docker_migration_testfile %{docker_store}/.suse-image-migration-v1to2-complete + +%define git_version 9e83765 %define go_arches %ix86 x86_64 Name: docker -Version: 1.9.1 +Version: 1.10.3 Release: 0 Summary: The Linux container runtime License: Apache-2.0 @@ -41,26 +45,26 @@ Source8: docker-audit.rules # TODO: remove once we figure out what is wrong with iptables on ppc64le Source100: sysconfig.docker.ppc64le -Patch0: fix-docker-init.patch -# PATCH-FIX-OPENSUSE libcontainer-apparmor-fixes.patch -- mount rules aren't supported in our apparmor -Patch1: libcontainer-apparmor-fixes.patch +Patch0: fix_platform_type_arm.patch +Patch1: gcc5_socket_workaround.patch +Patch2: fix-docker-init.patch +Patch3: fix-apparmor.patch # Required to overcome some limitations of gcc-go: https://groups.google.com/forum/#!msg/golang-nuts/SlGCPYkjxo4/4DjcjXRCqAkJ # Right now docker passes the sha1sum of the dockerinit binary to the docker binary at build time # We cannot do that, right now a quick and really dirty way to get it running is # to simply disable this check Patch100: ignore-dockerinit-checksum.patch -Patch101: gcc-go-build-static-libgo.patch -Patch102: add_bolt_ppc64.patch -Patch103: docker_remove_journald_to_fix_dynbinary_build_on_arm.patch -Patch104: docker_remove_journald_to_fix_dynbinary_build_on_powerpc.patch -Patch105: add_bolt_arm64.patch -Patch106: docker_remove_journald_to_fix_dynbinary_build_on_arm64.patch +Patch101: gcc-go-patches.patch +Patch102: netlink_gcc_go.patch +Patch103: netlink_netns_powerpc.patch +Patch104: boltdb_bolt_powerpc.patch +Patch105: libnetwork_drivers_bridge_powerpc.patch BuildRequires: audit BuildRequires: bash-completion BuildRequires: device-mapper-devel >= 1.2.68 BuildRequires: glibc-devel-static %ifarch %go_arches -BuildRequires: go >= 1.4 +BuildRequires: go >= 1.5 BuildRequires: go-go-md2man %else BuildRequires: gcc5-go >= 5.0 @@ -84,6 +88,8 @@ Requires: procps Requires: tar >= 1.26 Requires: xz >= 4.9 +# Not necessary, but must be installed to have a smooth upgrade. +Recommends: docker-image-migrator Conflicts: lxc < 1.0 PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -140,21 +146,33 @@ Requires: sqlite3-devel BuildArch: noarch +%global __requires_exclude ^libgo.so.*$ + %description test Test package for docker. It contains the source code and the tests. %prep -%setup -q -n docker-%{version} +%setup -q -n %{name}-%{version} %patch0 -p1 +# 1330 is Tumbleweed after leap has been released +# gcc5-go in Tumbleweed includes this commit +# https://github.com/golang/gofrontend/commit/a850225433a66a58613c22185c3b096… +# Which "fixes" the data type for RawSockaddr.Data +# However, docker now expects the "wrong" data type, since docker had a workaround +# for that issue. +# Thus, we need to workaround the workaroundn in tumbleweed +%if 0%{?suse_version} >= 1330 && 0%{?is_opensuse} == 1 %patch1 -p1 +%endif +%patch2 -p1 +%patch3 -p1 %ifnarch %go_arches -%patch100 -p1 -%patch101 -p0 +%patch101 -p1 %patch102 -p1 %patch103 -p1 %patch104 -p1 %patch105 -p1 -%patch106 -p1 +%patch100 -p1 %endif cp %{SOURCE7} . @@ -174,10 +192,14 @@ EOF ) > docker_build_env . ./docker_build_env -./hack/make.sh dynbinary + %ifarch %go_arches +./hack/make.sh dynbinary man/md2man-all.sh +%else +./hack/make.sh dyngccgo %endif + # remove other than systemd # otherwise the resulting package will have extra requires rm -rf hack/make/.build-deb @@ -185,9 +207,14 @@ %install install -d %{buildroot}%{go_contribdir} install -d %{buildroot}%{_bindir} +%ifarch %go_arches install -D -m755 bundles/%{version}/dynbinary/%{name}-%{version} %{buildroot}/%{_bindir}/%{name} -install -d %{buildroot}/%{_prefix}/lib/docker install -D -m755 bundles/%{version}/dynbinary/dockerinit-%{version} %{buildroot}/%{_prefix}/lib/docker/dockerinit +%else +install -D -m755 bundles/%{version}/dyngccgo/%{name}-%{version} %{buildroot}/%{_bindir}/%{name} +install -D -m755 bundles/%{version}/dyngccgo/dockerinit-%{version} %{buildroot}/%{_prefix}/lib/docker/dockerinit +%endif +install -d %{buildroot}/%{_prefix}/lib/docker install -Dd -m 0755 \ %{buildroot}%{_sysconfdir}/init.d \ %{buildroot}%{_sbindir} @@ -233,6 +260,73 @@ %fdupes %{buildroot} %pre +# We're currently inside rpmlint, which will cause us to fail the tests if it +# happens that the Docker install in the builder requires a migration. +if [[ -z "$BUILD_ROOT" ]] +then + # In order to make sure we don't print a scary warning when we shouldn't we + # need to test these things (in this order): + # 1. Check that /var/lib/docker actually exists (docker daemon has run). + # 2. Check that the migrator has *not* finished. + # 3. Check that /var/lib/docker/graph exists (this is a <=1.9.1 thing, but + # will stick around if it has been migrated -- which is why we need the + # MIGRATION_TESTFILE check). + # 4. Check that there are images in the graph/ directory. + if [[ -d "%{docker_store}" && ( ! -f "%{docker_migration_testfile}" ) && -d "%{docker_store}" && -n "$(find "%{docker_store}" -maxdepth 1 -type d 2>/dev/null | grep -Ev '_tmp|^%{docker_store}$')" ]] + then + + if [ -n "$DOCKER_FORCE_INSTALL" ] + then + echo >&2 "*** IGNORING DOWNTIME WARNING! FORCING INSTALLATION. ***" + else + +cat >&2 <<EOF + + *** WARNING *** + +In the migration from docker<1.10.0 to docker>=1.10.0, the Docker image format +has changed to be completely content-addressible. This results in several positive +improvements to image operations (better caching during builds mainly). However, +the migration operation may take several hours if you have a lot of large images +on a Docker host. In order to ensure that you have minimum downtime, this update +of Docker will not complete successfully, and you will have the opportunity to +run a separate migration tool (which will not cause downtime for your Docker +daemon). + +In order to run this migration tool, please install the 'docker-image-migrator' +package. You can run the migration with this command, which will exit after the +migration has been completed: + +$ /usr/lib/docker-image-migrator/do-image-migration-v1to2.sh + +Because the migrator requires information about the storage driver used by Docker, +the migration script will source /etc/sysconfig/docker and use \$DOCKER_OPTS as +arguments to the migrator. If this automated migration fails, it will be re-attempted +with every known storage driver. In addition, the script accepts arguments which +will simiarly be appended to the set of arguments (after \$DOCKER_OPTS) to the +migrator. + +However, if you prefer to not run this separate migration tool, you can force this +update using the following command. THIS WILL CAUSE DOWNTIME, BECAUSE DOCKER WILL +RUN THE MIGRATION ON FIRST START AND YOU WILL BE UNABLE TO START ANY CONTAINERS +OR USE ANY DOCKER COMMANDS (EVEN CONTAINERS WITH RESTART POLICIES ACTIVE): + +$ DOCKER_FORCE_INSTALL=1 sudo -E zypper up docker +EOF + + # Fail the update. + exit 1 + fi + fi + + # In order to make sure that we don't accidentally cause problems with an + # upgrade to docker>=1.10.2, we'll touch the same file we tested in (2). + # -m701 is *not* a typo, it is necessary for certain syscalls with remapped + # root. + [[ -d "%{docker_store}" ]] || install -d -m701 %{docker_store} || : + touch %{docker_migration_testfile} +fi + echo "creating group docker..." groupadd -r docker 2>/dev/null || : %service_add_pre %{name}.service %{name}.socket ++++++ _service ++++++ --- /var/tmp/diff_new_pack.xfQW4h/_old 2016-03-31 13:03:25.000000000 +0200 +++ /var/tmp/diff_new_pack.xfQW4h/_new 2016-03-31 13:03:25.000000000 +0200 @@ -3,8 +3,8 @@ <param name="url">https://github.com/docker/docker.git</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="versionformat">1.9.1</param> - <param name="revision">v1.9.1</param> + <param name="versionformat">1.10.3</param> + <param name="revision">v1.10.3</param> </service> <service name="recompress" mode="disabled"> <param name="file">docker-*.tar</param> ++++++ boltdb_bolt_powerpc.patch ++++++ --- vendor/src/github.com/boltdb/bolt/bolt_ppc64.go | 9 +++++++++ 1 file changed, 9 insertions(+) Index: docker-1.10.2/vendor/src/github.com/boltdb/bolt/bolt_ppc64.go =================================================================== --- /dev/null +++ docker-1.10.2/vendor/src/github.com/boltdb/bolt/bolt_ppc64.go @@ -0,0 +1,9 @@ +// +build ppc64 + +package bolt + +// maxMapSize represents the largest mmap size supported by Bolt. +const maxMapSize = 0xFFFFFFFFFFFF // 256TB + +// maxAllocSize is the size used when creating array pointers. +const maxAllocSize = 0x7FFFFFFF ++++++ docker-1.9.1.tar.xz -> docker-1.10.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/docker/docker-1.9.1.tar.xz /work/SRC/openSUSE:Factory/.docker.new/docker-1.10.3.tar.xz differ: char 26, line 1 ++++++ docker.service ++++++ --- /var/tmp/diff_new_pack.xfQW4h/_old 2016-03-31 13:03:25.000000000 +0200 +++ /var/tmp/diff_new_pack.xfQW4h/_new 2016-03-31 13:03:25.000000000 +0200 @@ -5,12 +5,17 @@ Requires=docker.socket [Service] +# the default is not to use systemd for cgroups because the delegate issues still +# exists and systemd currently does not support the cgroup feature set required +# for containers run by docker EnvironmentFile=/etc/sysconfig/docker -ExecStart=/usr/bin/docker daemon -H fd:// $DOCKER_OPTS +ExecStart=/usr/bin/docker daemon -H fd:// $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS MountFlags=slave LimitNOFILE=1048576 LimitNPROC=1048576 LimitCORE=infinity +# set delegate yes so that systemd does not reset the cgroups of docker containers +Delegate=yes [Install] WantedBy=multi-user.target ++++++ fix-apparmor.patch ++++++ Index: docker-1.10.1/contrib/apparmor/main.go =================================================================== --- docker-1.10.1.orig/contrib/apparmor/main.go +++ docker-1.10.1/contrib/apparmor/main.go @@ -11,8 +11,7 @@ import ( ) type profileData struct { - MajorVersion int - MinorVersion int + Version int } func main() { @@ -23,13 +22,12 @@ func main() { // parse the arg apparmorProfilePath := os.Args[1] - majorVersion, minorVersion, err := aaparser.GetVersion() + version, err := aaparser.GetVersion() if err != nil { log.Fatal(err) } data := profileData{ - MajorVersion: majorVersion, - MinorVersion: minorVersion, + Version: version, } fmt.Printf("apparmor_parser is of version %+v\n", data) Index: docker-1.10.1/daemon/execdriver/native/apparmor.go =================================================================== --- docker-1.10.1.orig/daemon/execdriver/native/apparmor.go +++ docker-1.10.1/daemon/execdriver/native/apparmor.go @@ -25,8 +25,7 @@ type data struct { ExecPath string Imports []string InnerImports []string - MajorVersion int - MinorVersion int + Version int } const baseTemplate = ` @@ -64,14 +63,17 @@ profile {{.Name}} flags=(attach_disconne deny /sys/firmware/efi/efivars/** rwklx, deny /sys/kernel/security/** rwklx, -{{if ge .MajorVersion 2}}{{if ge .MinorVersion 8}} +{{if ge .Version 208095}} + # apparmor-2.8.95 is Ubuntu 14.04 LTS (Trusty Tahr) + # apparmor-2.8.95 is apparmor-2.9 beta, which supports ptrace rule + # other apparmor-2.8 versions do not support this rule # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container ptrace (trace,read) peer=docker-default, -{{end}}{{end}} -{{if ge .MajorVersion 2}}{{if ge .MinorVersion 9}} +{{end}} +{{if ge .Version 209000}} # docker daemon confinement requires explict allow rule for signal signal (receive) set=(kill,term) peer={{.ExecPath}}, -{{end}}{{end}} +{{end}} } ` @@ -91,7 +93,7 @@ func generateProfile(out io.Writer) erro if abstractionsExists() { data.InnerImports = append(data.InnerImports, "#include <abstractions/base>") } - data.MajorVersion, data.MinorVersion, err = aaparser.GetVersion() + data.Version, err = aaparser.GetVersion() if err != nil { return err } Index: docker-1.10.1/pkg/aaparser/aaparser.go =================================================================== --- docker-1.10.1.orig/pkg/aaparser/aaparser.go +++ docker-1.10.1/pkg/aaparser/aaparser.go @@ -1,45 +1,92 @@ +// Package aaparser is a convenience package interacting with `apparmor_parser`. package aaparser import ( "fmt" - "log" "os/exec" + "path/filepath" "strconv" "strings" ) -// GetVersion returns the major and minor version of apparmor_parser -func GetVersion() (int, int, error) { - // get the apparmor_version version - cmd := exec.Command("apparmor_parser", "--version") +const ( + binary = "apparmor_parser" +) + +// GetVersion returns the major and minor version of apparmor_parser. +func GetVersion() (int, error) { + output, err := cmd("", "--version") + if err != nil { + return -1, err + } + + return parseVersion(output) +} - output, err := cmd.CombinedOutput() +// LoadProfile runs `apparmor_parser -r -W` on a specified apparmor profile to +// replace and write it to disk. +func LoadProfile(profilePath string) error { + _, err := cmd(filepath.Dir(profilePath), "-r", "-W", filepath.Base(profilePath)) if err != nil { - log.Fatalf("getting apparmor_parser version failed: %s (%s)", err, output) + return err } + return nil +} + +// cmd runs `apparmor_parser` with the passed arguments. +func cmd(dir string, arg ...string) (string, error) { + c := exec.Command(binary, arg...) + c.Dir = dir - // parse the version from the output + output, err := c.CombinedOutput() + if err != nil { + return "", fmt.Errorf("running `%s %s` failed with output: %s\nerror: %v", c.Path, strings.Join(c.Args, " "), string(output), err) + } + + return string(output), nil +} + +// parseVersion takes the output from `apparmor_parser --version` and returns +// a representation of the {major, minor, patch} version as a single number of +// the form MMmmPPP {major, minor, patch}. +func parseVersion(output string) (int, error) { // output is in the form of the following: // AppArmor parser version 2.9.1 // Copyright (C) 1999-2008 Novell Inc. // Copyright 2009-2012 Canonical Ltd. - lines := strings.SplitN(string(output), "\n", 2) + + lines := strings.SplitN(output, "\n", 2) words := strings.Split(lines[0], " ") version := words[len(words)-1] + // split by major minor version v := strings.Split(version, ".") - if len(v) < 2 { - return -1, -1, fmt.Errorf("parsing major minor version failed for %q", version) + if len(v) == 0 || len(v) > 3 { + return -1, fmt.Errorf("parsing version failed for output: `%s`", output) } + // Default the versions to 0. + var majorVersion, minorVersion, patchLevel int + majorVersion, err := strconv.Atoi(v[0]) if err != nil { - return -1, -1, err + return -1, err } - minorVersion, err := strconv.Atoi(v[1]) - if err != nil { - return -1, -1, err + + if len(v) > 1 { + minorVersion, err = strconv.Atoi(v[1]) + if err != nil { + return -1, err + } + } + if len(v) > 2 { + patchLevel, err = strconv.Atoi(v[2]) + if err != nil { + return -1, err + } } - return majorVersion, minorVersion, nil + // major*10^5 + minor*10^3 + patch*10^0 + numericVersion := majorVersion*1e5 + minorVersion*1e3 + patchLevel + return numericVersion, nil } Index: docker-1.10.1/contrib/apparmor/template.go =================================================================== --- docker-1.10.1.orig/contrib/apparmor/template.go +++ docker-1.10.1/contrib/apparmor/template.go @@ -20,11 +20,11 @@ profile /usr/bin/docker (attach_disconne umount, pivot_root, -{{if ge .MajorVersion 2}}{{if ge .MinorVersion 9}} +{{if ge .Version 209000}} signal (receive) peer=@{profile_name}, signal (receive) peer=unconfined, signal (send), -{{end}}{{end}} +{{end}} network, capability, owner /** rw, @@ -46,12 +46,12 @@ profile /usr/bin/docker (attach_disconne /etc/ld.so.cache r, /etc/passwd r, -{{if ge .MajorVersion 2}}{{if ge .MinorVersion 9}} +{{if ge .Version 209000}} ptrace peer=@{profile_name}, ptrace (read) peer=docker-default, deny ptrace (trace) peer=docker-default, deny ptrace peer=/usr/bin/docker///bin/ps, -{{end}}{{end}} +{{end}} /usr/lib/** rm, /lib/** rm, @@ -72,11 +72,11 @@ profile /usr/bin/docker (attach_disconne /sbin/zfs rCx, /sbin/apparmor_parser rCx, -{{if ge .MajorVersion 2}}{{if ge .MinorVersion 9}} +{{if ge .Version 209000}} # Transitions change_profile -> docker-*, change_profile -> unconfined, -{{end}}{{end}} +{{end}} profile /bin/cat (complain) { /etc/ld.so.cache r, @@ -98,10 +98,10 @@ profile /usr/bin/docker (attach_disconne /dev/null rw, /bin/ps mr, -{{if ge .MajorVersion 2}}{{if ge .MinorVersion 9}} +{{if ge .Version 209000}} # We don't need ptrace so we'll deny and ignore the error. deny ptrace (read, trace), -{{end}}{{end}} +{{end}} # Quiet dac_override denials deny capability dac_override, @@ -119,15 +119,15 @@ profile /usr/bin/docker (attach_disconne /proc/tty/drivers r, } profile /sbin/iptables (complain) { -{{if ge .MajorVersion 2}}{{if ge .MinorVersion 9}} +{{if ge .Version 209000}} signal (receive) peer=/usr/bin/docker, -{{end}}{{end}} +{{end}} capability net_admin, } profile /sbin/auplink flags=(attach_disconnected, complain) { -{{if ge .MajorVersion 2}}{{if ge .MinorVersion 9}} +{{if ge .Version 209000}} signal (receive) peer=/usr/bin/docker, -{{end}}{{end}} +{{end}} capability sys_admin, capability dac_override, @@ -146,9 +146,9 @@ profile /usr/bin/docker (attach_disconne /proc/[0-9]*/mounts rw, } profile /sbin/modprobe /bin/kmod (complain) { -{{if ge .MajorVersion 2}}{{if ge .MinorVersion 9}} +{{if ge .Version 209000}} signal (receive) peer=/usr/bin/docker, -{{end}}{{end}} +{{end}} capability sys_module, /etc/ld.so.cache r, /lib/** rm, @@ -162,9 +162,9 @@ profile /usr/bin/docker (attach_disconne } # xz works via pipes, so we do not need access to the filesystem. profile /usr/bin/xz (complain) { -{{if ge .MajorVersion 2}}{{if ge .MinorVersion 9}} +{{if ge .Version 209000}} signal (receive) peer=/usr/bin/docker, -{{end}}{{end}} +{{end}} /etc/ld.so.cache r, /lib/** rm, /usr/bin/xz rm, ++++++ fix-docker-init.patch ++++++ --- /var/tmp/diff_new_pack.xfQW4h/_old 2016-03-31 13:03:25.000000000 +0200 +++ /var/tmp/diff_new_pack.xfQW4h/_new 2016-03-31 13:03:25.000000000 +0200 @@ -8,3 +8,14 @@ +/usr/bin/strip -s $DEST/dockerinit-$VERSION # sha1 our new dockerinit to ensure separate docker and dockerinit always run in a perfect pair compiled for one another export DOCKER_INITSHA1=$($sha1sum "$DEST/dockerinit-$VERSION" | cut -d' ' -f1) +diff --git a/hack/make/.dockerinit-gccgo b/hack/make/.dockerinit-gccgo +index 3caa526..f272d29 100644 +--- a/hack/make/.dockerinit-gccgo ++++ b/hack/make/.dockerinit-gccgo +@@ -27,5 +27,6 @@ else + exit 1 + fi + ++/usr/bin/strip -s $DEST/dockerinit-$VERSION + # sha1 our new dockerinit to ensure separate docker and dockerinit always run in a perfect pair compiled for one another + export DOCKER_INITSHA1=$($sha1sum "$DEST/dockerinit-$VERSION" | cut -d' ' -f1) ++++++ fix_platform_type_arm.patch ++++++ diff --git a/pkg/platform/utsname_int8.go b/pkg/platform/utsname_int8.go index 5dcbadf..a022a35 100644 --- a/pkg/platform/utsname_int8.go +++ b/pkg/platform/utsname_int8.go @@ -1,4 +1,4 @@ -// +build linux,386 linux,amd64 linux,arm64 +// +build linux,386 linux,amd64 // see golang's sources src/syscall/ztypes_linux_*.go that use int8 package platform diff --git a/pkg/platform/utsname_uint8.go b/pkg/platform/utsname_uint8.go index c9875cf..0ee937a 100644 --- a/pkg/platform/utsname_uint8.go +++ b/pkg/platform/utsname_uint8.go @@ -1,4 +1,4 @@ -// +build linux,arm linux,ppc64 linux,ppc64le s390x +// +build linux,arm linux,ppc64 linux,ppc64le s390x linux,arm64 linux,aarch64 // see golang's sources src/syscall/ztypes_linux_*.go that use uint8 package platform ++++++ gcc-go-patches.patch ++++++ diff --git a/hack/make/gccgo b/hack/make/gccgo index 878c814..84b7f69 100644 --- a/hack/make/gccgo +++ b/hack/make/gccgo @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -ex BINARY_NAME="docker-$VERSION" BINARY_EXTENSION="$(binary_extension)" @@ -16,9 +16,11 @@ go build -compiler=gccgo \ "${BUILDFLAGS[@]}" \ -gccgoflags " -g + -Wl,--add-needed -Wl,--no-as-needed $EXTLDFLAGS_STATIC + -static-libgo -Wl,--no-export-dynamic - -ldl + -ldl -lselinux -lsystemd -pthread " \ ./docker ++++++ gcc5_socket_workaround.patch ++++++ diff --git a/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated… b/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated… index 007ccb2..65f638f 100644 --- a/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated… +++ b/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated… @@ -22,7 +22,7 @@ type ifreqIndex struct { type ifreqHwaddr struct { IfrnName [ifNameSize]byte - IfruHwaddr syscall.RawSockaddr + IfruHwaddr patchedRawSockAddr } var rnd = rand.New(rand.NewSource(time.Now().UnixNano())) diff --git a/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_ppc… b/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_ppc… new file mode 100644 index 0000000..118f7bf --- /dev/null +++ b/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_ppc… @@ -0,0 +1,11 @@ +// Copyright (c) 2015 SUSE LLC. All rights reserved. + +// +build linux +// +build ppc64 ppc64le + +package bridge + +type patchedRawSockAddr struct { + Family uint16 + Data [14]int8 +} diff --git a/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_typ… b/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_typ… new file mode 100644 index 0000000..cdba329 --- /dev/null +++ b/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_typ… @@ -0,0 +1,10 @@ +// Copyright (c) 2015 SUSE LLC. All rights reserved. + +// +build linux,!ppc64,!ppc64le + +package bridge + +type patchedRawSockAddr struct { + Family uint16 + Data [14]int8 +} ++++++ ignore-dockerinit-checksum.patch ++++++ --- /var/tmp/diff_new_pack.xfQW4h/_old 2016-03-31 13:03:25.000000000 +0200 +++ /var/tmp/diff_new_pack.xfQW4h/_new 2016-03-31 13:03:25.000000000 +0200 @@ -1,11 +1,12 @@ -diff -Naur a/utils/utils.go b/utils/utils.go ---- a/utils/utils.go 2015-08-11 18:35:27.000000000 +0200 -+++ b/utils/utils.go 2015-08-12 18:06:47.930445696 +0200 -@@ -76,7 +76,7 @@ +diff --git a/utils/utils.go b/utils/utils.go +index 340b9e4..70a85a6 100644 +--- a/utils/utils.go ++++ b/utils/utils.go +@@ -75,7 +75,7 @@ func isValidDockerInitPath(target string, selfPath string) bool { // target and } return os.SameFile(targetFileInfo, selfPathFileInfo) } -- return dockerversion.INITSHA1 != "" && dockerInitSha1(target) == dockerversion.INITSHA1 +- return dockerversion.InitSHA1 != "" && dockerInitSha1(target) == dockerversion.InitSHA1 + return true } ++++++ libnetwork_drivers_bridge_powerpc.patch ++++++ --- vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_l… | 2 +- vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_l… | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: docker-1.10.2/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlin… =================================================================== --- docker-1.10.2.orig/vendor/src/github.com/docker/libnetwork/drivers/bridge/n… +++ docker-1.10.2/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlin… @@ -1,4 +1,4 @@ -// +build arm ppc64 ppc64le +// +build arm,!ppc64,!ppc64le package bridge Index: docker-1.10.2/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlin… =================================================================== --- docker-1.10.2.orig/vendor/src/github.com/docker/libnetwork/drivers/bridge/n… +++ docker-1.10.2/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlin… @@ -1,4 +1,4 @@ -// +build !arm,!ppc64,!ppc64le +// +build !arm ppc64 ppc64le package bridge ++++++ netlink_gcc_go.patch ++++++ diff --git a/vendor/src/github.com/vishvananda/netlink/link_linux.go b/vendor/src/github.com/vishvananda/netlink/link_linux.go index 3aa9124..6ad7c2b 100644 --- a/vendor/src/github.com/vishvananda/netlink/link_linux.go +++ b/vendor/src/github.com/vishvananda/netlink/link_linux.go @@ -415,11 +415,11 @@ func LinkAdd(link Link) error { req.Flags |= syscall.IFF_TUN_EXCL copy(req.Name[:15], base.Name) req.Flags |= uint16(tuntap.Mode) - _, _, errno := syscall.Syscall(syscall.SYS_IOCTL, file.Fd(), uintptr(syscall.TUNSETIFF), uintptr(unsafe.Pointer(&req))) + _, _, errno := syscall.Syscall(syscall.SYS_IOCTL, file.Fd(), uintptr(syscall_TUNSETIFF), uintptr(unsafe.Pointer(&req))) if errno != 0 { return fmt.Errorf("Tuntap IOCTL TUNSETIFF failed, errno %v", errno) } - _, _, errno = syscall.Syscall(syscall.SYS_IOCTL, file.Fd(), uintptr(syscall.TUNSETPERSIST), 1) + _, _, errno = syscall.Syscall(syscall.SYS_IOCTL, file.Fd(), uintptr(syscall_TUNSETPERSIST), 1) if errno != 0 { return fmt.Errorf("Tuntap IOCTL TUNSETPERSIST failed, errno %v", errno) } diff --git a/vendor/src/github.com/vishvananda/netlink/link_linux_others.go b/vendor/src/github.com/vishvananda/netlink/link_linux_others.go new file mode 100644 index 0000000..feb6070 --- /dev/null +++ b/vendor/src/github.com/vishvananda/netlink/link_linux_others.go @@ -0,0 +1,9 @@ +// +build linux +// +build x86_64 arm64 s390x + +package netlink + +const ( + syscall_TUNSETIFF = 0x400454ca + syscall_TUNSETPERSIST = 0x400454ca +) diff --git a/vendor/src/github.com/vishvananda/netlink/link_linux_powerpc.go b/vendor/src/github.com/vishvananda/netlink/link_linux_powerpc.go new file mode 100644 index 0000000..fac7c06 --- /dev/null +++ b/vendor/src/github.com/vishvananda/netlink/link_linux_powerpc.go @@ -0,0 +1,9 @@ +// +build linux +// +build ppc64 ppc64le + +package netlink + +const ( + syscall_TUNSETIFF = 0x800454ca + syscall_TUNSETPERSIST = 0x800454ca +) ++++++ netlink_netns_powerpc.patch ++++++ --- vendor/src/github.com/vishvananda/netns/netns_linux_ppc64.go | 7 +++++++ 1 file changed, 7 insertions(+) Index: docker-1.10.2/vendor/src/github.com/vishvananda/netns/netns_linux_ppc64.go =================================================================== --- /dev/null +++ docker-1.10.2/vendor/src/github.com/vishvananda/netns/netns_linux_ppc64.go @@ -0,0 +1,7 @@ +// +build linux,ppc64 + +package netns + +const ( + SYS_SETNS = 350 +) ++++++ sysconfig.docker ++++++ --- /var/tmp/diff_new_pack.xfQW4h/_old 2016-03-31 13:03:25.000000000 +0200 +++ /var/tmp/diff_new_pack.xfQW4h/_new 2016-03-31 13:03:25.000000000 +0200 @@ -6,3 +6,5 @@ ## ServiceRestart : docker # DOCKER_OPTS="" + +DOCKER_NETWORK_OPTIONS=""

1 0

commit caja for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '16

31 Mar '16

Hello community, here is the log from the commit of package caja for openSUSE:Factory checked in at 2016-03-31 13:03:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/caja (Old) and /work/SRC/openSUSE:Factory/.caja.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "caja" Changes: -------- --- /work/SRC/openSUSE:Factory/caja/caja.changes 2016-03-17 16:48:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.caja.new/caja.changes 2016-03-31 13:03:18.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Mar 29 18:41:47 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to 1.12.7: + * Fix remaining random changes of font color in icon view. + +------------------------------------------------------------------- Old: ---- caja-1.12.6.tar.xz New: ---- caja-1.12.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ caja.spec ++++++ --- /var/tmp/diff_new_pack.fu5r0n/_old 2016-03-31 13:03:19.000000000 +0200 +++ /var/tmp/diff_new_pack.fu5r0n/_new 2016-03-31 13:03:19.000000000 +0200 @@ -20,7 +20,7 @@ %define typelib typelib-1_0-Caja-2_0 %define _version 1.12 Name: caja -Version: 1.12.6 +Version: 1.12.7 Release: 0 Summary: File manager for the MATE desktop License: GPL-2.0 and LGPL-2.0 ++++++ caja-1.12.6.tar.xz -> caja-1.12.7.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.6/NEWS new/caja-1.12.7/NEWS --- old/caja-1.12.6/NEWS 2016-03-14 15:59:28.000000000 +0100 +++ new/caja-1.12.7/NEWS 2016-03-29 13:54:57.000000000 +0200 @@ -1,3 +1,6 @@ +Major changes in 1.12.7 are: +* Fix remaining random changes of font color in icon view + Major changes in 1.12.6 are: * Really fix loading multiple python extensions: revert the commit that proved to broke the fix. NOTE: as a side effect, the extensions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.6/configure new/caja-1.12.7/configure --- old/caja-1.12.6/configure 2016-03-14 16:02:37.000000000 +0100 +++ new/caja-1.12.7/configure 2016-03-29 13:56:27.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for caja 1.12.6. +# Generated by GNU Autoconf 2.69 for caja 1.12.7. # # Report bugs to <http://www.mate-desktop.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='caja' PACKAGE_TARNAME='caja' -PACKAGE_VERSION='1.12.6' -PACKAGE_STRING='caja 1.12.6' +PACKAGE_VERSION='1.12.7' +PACKAGE_STRING='caja 1.12.7' PACKAGE_BUGREPORT='http://www.mate-desktop.org' PACKAGE_URL='' @@ -1475,7 +1475,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures caja 1.12.6 to adapt to many kinds of systems. +\`configure' configures caja 1.12.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1545,7 +1545,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of caja 1.12.6:";; + short | recursive ) echo "Configuration of caja 1.12.7:";; esac cat <<\_ACEOF @@ -1696,7 +1696,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -caja configure 1.12.6 +caja configure 1.12.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2065,7 +2065,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by caja $as_me 1.12.6, which was +It was created by caja $as_me 1.12.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2975,7 +2975,7 @@ # Define the identity of the package. PACKAGE='caja' - VERSION='1.12.6' + VERSION='1.12.7' cat >>confdefs.h <<_ACEOF @@ -17169,7 +17169,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by caja $as_me 1.12.6, which was +This file was extended by caja $as_me 1.12.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17235,7 +17235,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -caja config.status 1.12.6 +caja config.status 1.12.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.6/configure.ac new/caja-1.12.7/configure.ac --- old/caja-1.12.6/configure.ac 2016-03-14 15:53:44.000000000 +0100 +++ new/caja-1.12.7/configure.ac 2016-03-29 13:49:55.000000000 +0200 @@ -19,7 +19,7 @@ m4_define(caja_extension_current, 5) m4_define(caja_extension_revision, 0) -AC_INIT([caja], [1.12.6], [http://www.mate-desktop.org] +AC_INIT([caja], [1.12.7], [http://www.mate-desktop.org] # GLib min/max required versions AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_36], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.6/data/caja-autorun-software.desktop.in new/caja-1.12.7/data/caja-autorun-software.desktop.in --- old/caja-1.12.6/data/caja-autorun-software.desktop.in 2016-03-14 16:02:44.000000000 +0100 +++ new/caja-1.12.7/data/caja-autorun-software.desktop.in 2016-03-29 13:56:33.000000000 +0200 @@ -11,4 +11,4 @@ X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=caja X-MATE-Bugzilla-Component=general -X-MATE-Bugzilla-Version=1.12.6 +X-MATE-Bugzilla-Version=1.12.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.6/data/caja-browser.desktop.in new/caja-1.12.7/data/caja-browser.desktop.in --- old/caja-1.12.6/data/caja-browser.desktop.in 2016-03-14 16:02:44.000000000 +0100 +++ new/caja-1.12.7/data/caja-browser.desktop.in 2016-03-29 13:56:33.000000000 +0200 @@ -14,4 +14,4 @@ X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=caja X-MATE-Bugzilla-Component=general -X-MATE-Bugzilla-Version=1.12.6 +X-MATE-Bugzilla-Version=1.12.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.6/data/caja-computer.desktop.in new/caja-1.12.7/data/caja-computer.desktop.in --- old/caja-1.12.6/data/caja-computer.desktop.in 2016-03-14 16:02:44.000000000 +0100 +++ new/caja-1.12.7/data/caja-computer.desktop.in 2016-03-29 13:56:33.000000000 +0200 @@ -14,4 +14,4 @@ X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=caja X-MATE-Bugzilla-Component=general -X-MATE-Bugzilla-Version=1.12.6 +X-MATE-Bugzilla-Version=1.12.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.6/data/caja-file-management-properties.desktop.in new/caja-1.12.7/data/caja-file-management-properties.desktop.in --- old/caja-1.12.6/data/caja-file-management-properties.desktop.in 2016-03-14 16:02:44.000000000 +0100 +++ new/caja-1.12.7/data/caja-file-management-properties.desktop.in 2016-03-29 13:56:33.000000000 +0200 @@ -12,4 +12,4 @@ X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=caja X-MATE-Bugzilla-Component=Preferences -X-MATE-Bugzilla-Version=1.12.6 +X-MATE-Bugzilla-Version=1.12.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.6/data/caja-folder-handler.desktop.in new/caja-1.12.7/data/caja-folder-handler.desktop.in --- old/caja-1.12.6/data/caja-folder-handler.desktop.in 2016-03-14 16:02:44.000000000 +0100 +++ new/caja-1.12.7/data/caja-folder-handler.desktop.in 2016-03-29 13:56:33.000000000 +0200 @@ -13,4 +13,4 @@ X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=caja X-MATE-Bugzilla-Component=general -X-MATE-Bugzilla-Version=1.12.6 +X-MATE-Bugzilla-Version=1.12.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.6/data/caja.desktop new/caja-1.12.7/data/caja.desktop --- old/caja-1.12.6/data/caja.desktop 2016-03-14 16:03:22.000000000 +0100 +++ new/caja-1.12.7/data/caja.desktop 2016-03-29 13:57:12.000000000 +0200 @@ -229,7 +229,7 @@ X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=caja X-MATE-Bugzilla-Component=general -X-MATE-Bugzilla-Version=1.12.6 +X-MATE-Bugzilla-Version=1.12.7 X-MATE-Autostart-Phase=Desktop X-MATE-Autostart-Notify=true X-MATE-AutoRestart=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.6/data/caja.desktop.in new/caja-1.12.7/data/caja.desktop.in --- old/caja-1.12.6/data/caja.desktop.in 2016-03-14 16:02:44.000000000 +0100 +++ new/caja-1.12.7/data/caja.desktop.in 2016-03-29 13:56:33.000000000 +0200 @@ -11,7 +11,7 @@ X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=caja X-MATE-Bugzilla-Component=general -X-MATE-Bugzilla-Version=1.12.6 +X-MATE-Bugzilla-Version=1.12.7 X-MATE-Autostart-Phase=Desktop X-MATE-Autostart-Notify=true X-MATE-AutoRestart=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.6/eel/eel-background.c new/caja-1.12.7/eel/eel-background.c --- old/caja-1.12.6/eel/eel-background.c 2015-07-16 09:11:15.000000000 +0200 +++ new/caja-1.12.7/eel/eel-background.c 2016-03-29 13:47:34.000000000 +0200 @@ -355,8 +355,6 @@ free_background_surface (self); - /* Calls mate_bg_set_color, which sets "ignore-pending-change" to false, - and queues emission of changed signal if it's still false */ set_image_properties (self); window = gtk_widget_get_window (self->details->widget); @@ -365,12 +363,6 @@ self->details->is_desktop); self->details->unset_root_surface = self->details->is_desktop; - /* We got the surface and everything, so we don't care about a change - that is pending (unless things actually change after this time) */ - g_object_set_data (G_OBJECT (self->details->bg), - "ignore-pending-change", - GINT_TO_POINTER (TRUE)); - self->details->bg_entire_width = width; self->details->bg_entire_height = height; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.6/libcaja-private/caja-icon-container.c new/caja-1.12.7/libcaja-private/caja-icon-container.c --- old/caja-1.12.6/libcaja-private/caja-icon-container.c 2016-03-14 15:37:41.000000000 +0100 +++ new/caja-1.12.7/libcaja-private/caja-icon-container.c 2016-03-29 13:47:34.000000000 +0200 @@ -4566,8 +4566,6 @@ /* Set up DnD. */ caja_icon_dnd_init (container); - setup_label_gcs (container); - hadj = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (widget)); g_signal_connect (hadj, "value_changed", G_CALLBACK (handle_hadjustment_changed), widget); @@ -9424,7 +9422,7 @@ "frame_text", &frame_text, NULL); - if (frame_text /* || !eel_background_is_set(background) */) + if (frame_text || !eel_background_is_set (background)) { setup_gc_with_fg (container, LABEL_COLOR, eel_gdk_color_to_rgb (&style->text[GTK_STATE_NORMAL]));

1 0

commit irssi for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '16

31 Mar '16

Hello community, here is the log from the commit of package irssi for openSUSE:Factory checked in at 2016-03-31 13:03:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/irssi (Old) and /work/SRC/openSUSE:Factory/.irssi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "irssi" Changes: -------- --- /work/SRC/openSUSE:Factory/irssi/irssi.changes 2016-03-07 13:27:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.irssi.new/irssi.changes 2016-03-31 13:03:16.000000000 +0200 @@ -1,0 +2,15 @@ +Sat Mar 26 19:12:55 UTC 2016 - idonmez(a)suse.com + +- Update to version 0.8.19 + * Fixed regression when joining and parting channels on IRCnet + * Fixed SASL EXTERNAL + * Fixed regression when not using SASL + * Fixed incorrect SSL disconnects when using SSL from modules/scripts + * Fixed regression where proxy_string could not be configured or + certain file transfers could not be accepted + * Fixed storing layout of !channels + * Fixed restoration of bracketed paste mode on quit + * Make the usage of meta-O for cursor keys configurable with + /set term_appkey_mode off + +------------------------------------------------------------------- Old: ---- irssi-0.8.18.tar.xz irssi-0.8.18.tar.xz.asc New: ---- irssi-0.8.19.tar.xz irssi-0.8.19.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ irssi.spec ++++++ --- /var/tmp/diff_new_pack.0yMoEw/_old 2016-03-31 13:03:17.000000000 +0200 +++ /var/tmp/diff_new_pack.0yMoEw/_new 2016-03-31 13:03:17.000000000 +0200 @@ -19,7 +19,7 @@ %bcond_with socks Name: irssi -Version: 0.8.18 +Version: 0.8.19 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with socks} ++++++ irssi-0.8.18.tar.xz -> irssi-0.8.19.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/ChangeLog new/irssi-0.8.19/ChangeLog --- old/irssi-0.8.18/ChangeLog 2016-02-08 21:16:18.000000000 +0100 +++ new/irssi-0.8.19/ChangeLog 2016-03-23 00:25:20.000000000 +0100 @@ -1,10 +1,119 @@ -commit 109b75f50b9a98fe190bb6802a0def1d94900fcc +commit c43831574187cdb2323d123702aa687af24664d8 +Author: ailin-nemui <ailin-nemui(a)users.noreply.github.com> +Date: Wed Mar 23 00:08:24 2016 +0100 + + tag as 0.8.19 + +commit 6c0c0c60ad62e45664ee0c77ae3c926892de267c +Author: ailin-nemui <ailin-nemui(a)users.noreply.github.com> +Date: Tue Mar 22 16:54:34 2016 +0100 + + Make use of terminal application keys configurable + + adds a new setting term_appkey_mode which can enable or disable the use + of keyboard transmit (application keys) mode. Fixes #430 + +commit 6572005d3d8071dc7faa1637986ed81692203e13 +Author: ailin-nemui <ailin-nemui(a)users.noreply.github.com> +Date: Tue Mar 22 22:54:43 2016 +0100 + + Merge pull request #458 from ailin-nemui/fix_449 + + Properly toggle bracketed paste mode on stop/cont + +commit 5ef2b958d94af940746f607fb56776852c6b0a4d +Author: ailin-nemui <ailin-nemui(a)users.noreply.github.com> +Date: Tue Mar 22 22:57:28 2016 +0100 + + Merge pull request #457 from ailin-nemui/fix_450 + + fix race condition in terminal init + +commit c657b9c3b1bf867722f63892251b2294d6a87d56 +Author: ailin-nemui <ailin-nemui(a)users.noreply.github.com> +Date: Tue Mar 22 15:25:13 2016 +0100 + + Merge pull request #447 from ailin-nemui/fix_dcc_help + + correct quoting in /help dcc + +commit 4a2ee3c34471c29b884f5b0bc2b6ad95b56f500b +Author: ailin-nemui <ailin-nemui(a)users.noreply.github.com> +Date: Tue Mar 22 15:23:37 2016 +0100 + + Merge pull request #446 from ailin-nemui/fix_445 + + strip less whitespace from commands + +commit fe600dd5dc11c839c1fd90e77c4020c937e7c453 +Author: ailin-nemui <ailin-nemui(a)users.noreply.github.com> +Date: Sun Mar 20 22:06:41 2016 +0100 + + Merge pull request #442 from LemonBoy/fix-435 + + Do not assume any default value for statusmsg. + +commit 15296a0165007aece5ac732c1f53b0fc78ba9ba1 +Author: ailin-nemui <ailin-nemui(a)users.noreply.github.com> +Date: Sun Mar 20 22:00:43 2016 +0100 + + Merge pull request #444 from LemonBoy/timeout-id + + Use 0 as a sentinel value for sasl_timeout + +commit 7d3fe66e50fc3c47783d9beb0474a4ed9d2d9953 +Author: TheLemonMan <LemonBoy(a)users.noreply.github.com> +Date: Thu Mar 17 22:07:57 2016 +0100 + + Merge pull request #439 from horgh/ssl-errors + + Clear error queue before SSL I/O operations + +commit d20872ac27c63f2c92775a12c99a7494148901ca +Author: ailin-nemui <ailin-nemui(a)users.noreply.github.com> +Date: Thu Mar 17 16:14:34 2016 +0100 + + Merge pull request #438 from dequis/sasl-timeout-disconnect + + Remove sasl timeout source when the server disconnects + +commit 4416942fcdd426385cc3ef7a912f9260627b8a39 +Author: Giuseppe <LemonBoy(a)users.noreply.github.com> +Date: Tue Mar 8 22:49:05 2016 +0100 + + Merge pull request #432 from grawity/fix-external + + fix SASL EXTERNAL + +commit 025f08d5fc69d6e9c28004f8f7af26f613b0e0fb +Author: ailin-nemui <ailin-nemui(a)users.noreply.github.com> +Date: Fri Jan 29 05:33:14 2016 +0100 + + Merge pull request #407 from irssi/ailin-nemui-perl-bugs + + Mention known Perl Bugs in perl.txt + +commit 22d772890e6f3b9622485fd83529f73891567e71 +Author: dx <dx(a)dxzone.com.ar> +Date: Tue Jan 26 03:25:07 2016 -0300 + + Merge pull request #405 from LemonBoy/serialize-channel-name + + Serialize the 'name' attribute of the CHANNEL_REC. + +commit 15f79a713f3e100a3b96b65e951fb37ae8994bdd +Author: ailin-nemui <ailin-nemui(a)users.noreply.github.com> +Date: Wed Mar 23 00:07:43 2016 +0100 + + set version to 0.8.18a-head + +commit b91f3c3025dc5cace2c14cb5b2da005400b5cd6a Author: ailin-nemui <ailin-nemui(a)users.noreply.github.com> Date: Mon Feb 8 14:53:17 2016 +0100 tag as 0.8.18 -commit 37f82c74c6b181d39327749c4ccea7587301f439 +commit 8ab537cf22371f9115002484b320719676dab86b Author: ailin-nemui <ailin-nemui(a)users.noreply.github.com> Date: Mon Feb 8 21:03:35 2016 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/Makefile.in new/irssi-0.8.19/Makefile.in --- old/irssi-0.8.18/Makefile.in 2016-02-08 21:22:35.000000000 +0100 +++ new/irssi-0.8.19/Makefile.in 2016-03-23 00:25:27.000000000 +0100 @@ -208,7 +208,7 @@ $(top_srcdir)/src/perl/textui/Makefile.PL.in \ $(top_srcdir)/src/perl/ui/Makefile.PL.in AUTHORS COPYING \ ChangeLog INSTALL NEWS TODO acconfig.h build-aux/compile \ - build-aux/config.guess build-aux/config.sub build-aux/depcomp \ + build-aux/config.guess build-aux/config.sub \ build-aux/install-sh build-aux/ltmain.sh build-aux/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/NEWS new/irssi-0.8.19/NEWS --- old/irssi-0.8.18/NEWS 2016-02-08 21:20:37.000000000 +0100 +++ new/irssi-0.8.19/NEWS 2016-03-23 00:23:24.000000000 +0100 @@ -1,3 +1,16 @@ +v0.8.19 2016-03-23 The Irssi team <staff(a)irssi.org> + - Fixed regression when joining and parting channels on IRCnet (#435) + - Fixed SASL EXTERNAL (#432) + - Fixed regression when not using SASL (#438) + - Fixed incorrect SSL disconnects when using SSL from modules/scripts + (#439) + - Fixed regression where proxy_string could not be configured or + certain file transfers could not be accepted (#445) + - Fixed storing layout of !channels (#183) + - Fixed restoration of bracketed paste mode on quit (#449) + - Make the usage of meta-O for cursor keys configurable with + /set term_appkey_mode off + v0.8.18 2016-02-13 The Irssi team <staff(a)irssi.org> * Modules will now require to define a void MODULENAME ## _abicheck(int *version) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/configure new/irssi-0.8.19/configure --- old/irssi-0.8.18/configure 2016-02-08 21:22:36.000000000 +0100 +++ new/irssi-0.8.19/configure 2016-03-23 00:25:26.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for irssi 0.8.18. +# Generated by GNU Autoconf 2.69 for irssi 0.8.19. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='irssi' PACKAGE_TARNAME='irssi' -PACKAGE_VERSION='0.8.18' -PACKAGE_STRING='irssi 0.8.18' +PACKAGE_VERSION='0.8.19' +PACKAGE_STRING='irssi 0.8.19' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1384,7 +1384,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures irssi 0.8.18 to adapt to many kinds of systems. +\`configure' configures irssi 0.8.19 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1454,7 +1454,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of irssi 0.8.18:";; + short | recursive ) echo "Configuration of irssi 0.8.19:";; esac cat <<\_ACEOF @@ -1598,7 +1598,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -irssi configure 0.8.18 +irssi configure 0.8.19 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2200,7 +2200,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by irssi $as_me 0.8.18, which was +It was created by irssi $as_me 0.8.19, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3069,7 +3069,7 @@ # Define the identity of the package. PACKAGE='irssi' - VERSION='0.8.18' + VERSION='0.8.19' # Some tools Automake needs. @@ -15812,7 +15812,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by irssi $as_me 0.8.18, which was +This file was extended by irssi $as_me 0.8.19, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15878,7 +15878,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -irssi config.status 0.8.18 +irssi config.status 0.8.19 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/configure.ac new/irssi-0.8.19/configure.ac --- old/irssi-0.8.18/configure.ac 2016-02-08 21:20:37.000000000 +0100 +++ new/irssi-0.8.19/configure.ac 2016-03-23 00:24:11.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT(irssi, 0.8.18) +AC_INIT(irssi, 0.8.19) AC_CONFIG_SRCDIR([src]) AC_CONFIG_AUX_DIR(build-aux) AC_PREREQ(2.50) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/docs/help/dcc new/irssi-0.8.19/docs/help/dcc --- old/irssi-0.8.18/docs/help/dcc 2016-02-08 21:16:18.000000000 +0100 +++ new/irssi-0.8.19/docs/help/dcc 2016-03-23 00:25:20.000000000 +0100 @@ -40,10 +40,10 @@ %9Examples:%9 /DCC CHAT mike - /DCC GET bob 'summer vacation.mkv' - /DCC SEND sarah documents/resume.pdf + /DCC GET bob summer vacation.mkv + /DCC SEND sarah "summer vacation.mkv" /DCC CLOSE get mike - /DCC CLOSE send bob 'summer vacation.mkv' + /DCC CLOSE send bob summer vacation.mkv %9See also:%9 CD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/docs/help/in/dcc.in new/irssi-0.8.19/docs/help/in/dcc.in --- old/irssi-0.8.18/docs/help/in/dcc.in 2016-01-20 23:08:07.000000000 +0100 +++ new/irssi-0.8.19/docs/help/in/dcc.in 2016-03-23 00:08:36.000000000 +0100 @@ -36,10 +36,10 @@ %9Examples:%9 /DCC CHAT mike - /DCC GET bob 'summer vacation.mkv' - /DCC SEND sarah documents/resume.pdf + /DCC GET bob summer vacation.mkv + /DCC SEND sarah "summer vacation.mkv" /DCC CLOSE get mike - /DCC CLOSE send bob 'summer vacation.mkv' + /DCC CLOSE send bob summer vacation.mkv %9See also:%9 CD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/docs/perl.txt new/irssi-0.8.19/docs/perl.txt --- old/irssi-0.8.18/docs/perl.txt 2016-02-08 21:20:37.000000000 +0100 +++ new/irssi-0.8.19/docs/perl.txt 2016-03-23 00:08:35.000000000 +0100 @@ -1193,3 +1193,7 @@ -------------------- * Calling die in 'script error' handler causes segfault (#101) * Storing and later using any Irssi object may result in use-after-free related crash + - Workaround: always acquire fresh objects +* Calling $dcc->close from the "dcc created" signal will cause unstable behaviour and crashes (#386) + - Workaround: use "dcc request" signal instead AND call + &Irssi::signal_continue(@_); as the first thing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/irssi-config.h new/irssi-0.8.19/irssi-config.h --- old/irssi-0.8.18/irssi-config.h 2016-02-08 21:16:29.000000000 +0100 +++ new/irssi-0.8.19/irssi-config.h 2016-03-23 00:25:31.000000000 +0100 @@ -108,7 +108,7 @@ #define PACKAGE_NAME "irssi" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "irssi 0.8.18" +#define PACKAGE_STRING "irssi 0.8.19" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "irssi" @@ -117,7 +117,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.8.18" +#define PACKAGE_VERSION "0.8.19" /* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/irssi-version.h new/irssi-0.8.19/irssi-version.h --- old/irssi-0.8.18/irssi-version.h 2016-02-08 21:22:40.000000000 +0100 +++ new/irssi-0.8.19/irssi-version.h 2016-03-23 00:29:08.000000000 +0100 @@ -1,2 +1,2 @@ -#define IRSSI_VERSION_DATE 20160208 -#define IRSSI_VERSION_TIME 1453 +#define IRSSI_VERSION_DATE 20160323 +#define IRSSI_VERSION_TIME 8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/src/common.h new/irssi-0.8.19/src/common.h --- old/irssi-0.8.18/src/common.h 2016-01-20 23:08:07.000000000 +0100 +++ new/irssi-0.8.19/src/common.h 2016-03-23 00:08:36.000000000 +0100 @@ -6,7 +6,7 @@ #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */ #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */ -#define IRSSI_ABI_VERSION 1 +#define IRSSI_ABI_VERSION 2 #define DEFAULT_SERVER_ADD_PORT 6667 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/src/core/network-openssl.c new/irssi-0.8.19/src/core/network-openssl.c --- old/irssi-0.8.18/src/core/network-openssl.c 2016-01-20 23:08:07.000000000 +0100 +++ new/irssi-0.8.19/src/core/network-openssl.c 2016-03-23 00:08:35.000000000 +0100 @@ -289,6 +289,7 @@ const char *errstr; gchar *errmsg; + ERR_clear_error(); ret1 = SSL_read(chan->ssl, buf, len); if(ret1 <= 0) { @@ -334,6 +335,7 @@ const char *errstr; gchar *errmsg; + ERR_clear_error(); ret1 = SSL_write(chan->ssl, (const char *)buf, len); if(ret1 <= 0) { @@ -471,6 +473,7 @@ if(!(fd = g_io_channel_unix_get_fd(handle))) return NULL; + ERR_clear_error(); ctx = SSL_CTX_new(SSLv23_client_method()); if (ctx == NULL) { g_error("Could not allocate memory for SSL context"); @@ -489,6 +492,7 @@ scert = convert_home(mycert); if (mypkey && *mypkey) spkey = convert_home(mypkey); + ERR_clear_error(); if (! SSL_CTX_use_certificate_file(ctx, scert, SSL_FILETYPE_PEM)) g_warning("Loading of client certificate '%s' failed: %s", mycert, ERR_reason_error_string(ERR_get_error())); else if (! SSL_CTX_use_PrivateKey_file(ctx, spkey ? spkey : scert, SSL_FILETYPE_PEM)) @@ -581,6 +585,7 @@ X509 *cert; const char *errstr; + ERR_clear_error(); ret = SSL_connect(chan->ssl); if (ret <= 0) { err = SSL_get_error(chan->ssl, ret); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/src/fe-common/core/completion.c new/irssi-0.8.19/src/fe-common/core/completion.c --- old/irssi-0.8.18/src/fe-common/core/completion.c 2016-02-08 21:20:37.000000000 +0100 +++ new/irssi-0.8.19/src/fe-common/core/completion.c 2016-03-23 00:08:36.000000000 +0100 @@ -757,7 +757,7 @@ int len; if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS | - PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS, + PARAM_FLAG_GETREST, "completion", &optlist, &key, &value)) return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/src/fe-common/core/fe-settings.c new/irssi-0.8.19/src/fe-common/core/fe-settings.c --- old/irssi-0.8.18/src/fe-common/core/fe-settings.c 2016-01-20 23:08:07.000000000 +0100 +++ new/irssi-0.8.19/src/fe-common/core/fe-settings.c 2016-03-23 00:08:36.000000000 +0100 @@ -109,7 +109,7 @@ SETTINGS_REC *rec; if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST | - PARAM_FLAG_OPTIONS | PARAM_FLAG_STRIP_TRAILING_WS, + PARAM_FLAG_OPTIONS, "set", &optlist, &key, &value)) return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/src/fe-common/core/windows-layout.c new/irssi-0.8.19/src/fe-common/core/windows-layout.c --- old/irssi-0.8.18/src/fe-common/core/windows-layout.c 2016-02-08 21:20:37.000000000 +0100 +++ new/irssi-0.8.19/src/fe-common/core/windows-layout.c 2016-03-23 00:08:35.000000000 +0100 @@ -168,12 +168,12 @@ chat_protocol_find_id(item->chat_type); if (proto != NULL) iconfig_node_set_str(subnode, "chat_type", proto->name); - iconfig_node_set_str(subnode, "name", item->visible_name); + iconfig_node_set_str(subnode, "name", item->name); if (item->server != NULL) { iconfig_node_set_str(subnode, "tag", item->server->tag); if (IS_CHANNEL(item)) { - rec = window_bind_add(window, item->server->tag, item->visible_name); + rec = window_bind_add(window, item->server->tag, item->name); if (rec != NULL) rec->sticky = TRUE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/src/fe-text/gui-readline.c new/irssi-0.8.19/src/fe-text/gui-readline.c --- old/irssi-0.8.18/src/fe-text/gui-readline.c 2016-02-08 21:20:37.000000000 +0100 +++ new/irssi-0.8.19/src/fe-text/gui-readline.c 2016-03-23 00:08:36.000000000 +0100 @@ -1039,6 +1039,7 @@ paste_join_multiline = settings_get_bool("paste_join_multiline"); paste_use_bracketed_mode = settings_get_bool("paste_use_bracketed_mode"); + term_set_appkey_mode(settings_get_bool("term_appkey_mode")); /* Enable the bracketed paste mode on demand */ term_set_bracketed_paste_mode(paste_use_bracketed_mode); } @@ -1061,6 +1062,7 @@ g_get_current_time(&last_keypress); input_listen_init(STDIN_FILENO); + settings_add_bool("lookandfeel", "term_appkey_mode", TRUE); settings_add_str("history", "scroll_page_count", "/2"); settings_add_time("misc", "paste_detect_time", "5msecs"); settings_add_bool("misc", "paste_use_bracketed_mode", FALSE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/src/fe-text/term-terminfo.c new/irssi-0.8.19/src/fe-text/term-terminfo.c --- old/irssi-0.8.18/src/fe-text/term-terminfo.c 2016-01-20 23:08:07.000000000 +0100 +++ new/irssi-0.8.19/src/fe-text/term-terminfo.c 2016-03-23 00:08:36.000000000 +0100 @@ -710,11 +710,3 @@ } } } - -void term_set_bracketed_paste_mode(int enable) -{ - if (enable) - tputs("\e[?2004h", 0, term_putchar); - else - tputs("\e[?2004l", 0, term_putchar); -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/src/fe-text/term.h new/irssi-0.8.19/src/fe-text/term.h --- old/irssi-0.8.18/src/fe-text/term.h 2016-01-20 23:08:07.000000000 +0100 +++ new/irssi-0.8.19/src/fe-text/term.h 2016-03-23 00:08:36.000000000 +0100 @@ -94,6 +94,7 @@ void term_stop(void); +void term_set_appkey_mode(int enable); void term_set_bracketed_paste_mode(int enable); /* keyboard input handling */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/src/fe-text/terminfo-core.c new/irssi-0.8.19/src/fe-text/terminfo-core.c --- old/irssi-0.8.18/src/fe-text/terminfo-core.c 2016-01-20 23:08:07.000000000 +0100 +++ new/irssi-0.8.19/src/fe-text/terminfo-core.c 2016-03-23 00:08:36.000000000 +0100 @@ -395,6 +395,20 @@ { } +static void terminfo_set_appkey_mode(TERM_REC *term, int set) +{ + if (term->TI_smkx && term->TI_rmkx) + tput(tparm(set ? term->TI_smkx : term->TI_rmkx)); +} + +static void term_dec_set_bracketed_paste_mode(int enable) +{ + if (enable) + tputs("\e[?2004h", 0, term_putchar); + else + tputs("\e[?2004l", 0, term_putchar); +} + static void term_fill_capabilities(TERM_REC *term) { int i, ival; @@ -496,7 +510,7 @@ } } -static void terminfo_input_init(TERM_REC *term) +static void terminfo_input_init0(TERM_REC *term) { tcgetattr(fileno(term->in), &term->old_tio); memcpy(&term->tio, &term->old_tio, sizeof(term->tio)); @@ -518,8 +532,11 @@ term->tio.c_cc[VSUSP] = _POSIX_VDISABLE; #endif - tcsetattr(fileno(term->in), TCSADRAIN, &term->tio); +} +static void terminfo_input_init(TERM_REC *term) +{ + tcsetattr(fileno(term->in), TCSADRAIN, &term->tio); } static void terminfo_input_deinit(TERM_REC *term) @@ -532,8 +549,11 @@ if (term->TI_smcup) tput(tparm(term->TI_smcup)); - if (term->TI_smkx) - tput(tparm(term->TI_smkx)); + if (term->appkey_enabled) + terminfo_set_appkey_mode(term, TRUE); + + if (term->bracketed_paste_enabled) + term_dec_set_bracketed_paste_mode(TRUE); terminfo_input_init(term); } @@ -545,12 +565,15 @@ /* move cursor to bottom of the screen */ terminfo_move(0, term->height-1); + if (term->bracketed_paste_enabled) + term_dec_set_bracketed_paste_mode(FALSE); + /* stop cup-mode */ if (term->TI_rmcup) tput(tparm(term->TI_rmcup)); - if (term->TI_rmkx) - tput(tparm(term->TI_rmkx)); + if (term->appkey_enabled) + terminfo_set_appkey_mode(term, FALSE); /* reset input settings */ terminfo_input_deinit(term); @@ -673,10 +696,29 @@ term->beep = term->TI_bel ? _beep : _ignore; terminfo_setup_colors(term, FALSE); + terminfo_input_init0(term); terminfo_cont(term); return 1; } +void term_set_appkey_mode(int enable) +{ + if (current_term->appkey_enabled == enable) + return; + + current_term->appkey_enabled = enable; + terminfo_set_appkey_mode(current_term, enable); +} + +void term_set_bracketed_paste_mode(int enable) +{ + if (current_term->bracketed_paste_enabled == enable) + return; + + current_term->bracketed_paste_enabled = enable; + term_dec_set_bracketed_paste_mode(enable); +} + TERM_REC *terminfo_core_init(FILE *in, FILE *out) { TERM_REC *old_term, *term; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/src/fe-text/terminfo-core.h new/irssi-0.8.19/src/fe-text/terminfo-core.h --- old/irssi-0.8.18/src/fe-text/terminfo-core.h 2016-01-20 23:08:07.000000000 +0100 +++ new/irssi-0.8.19/src/fe-text/terminfo-core.h 2016-03-23 00:08:36.000000000 +0100 @@ -92,6 +92,10 @@ /* Keyboard-transmit mode */ const char *TI_smkx; const char *TI_rmkx; + + /* Terminal mode states */ + int appkey_enabled; + int bracketed_paste_enabled; }; extern TERM_REC *current_term; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/src/irc/core/irc-servers.c new/irssi-0.8.19/src/irc/core/irc-servers.c --- old/irssi-0.8.18/src/irc/core/irc-servers.c 2016-01-20 23:08:07.000000000 +0100 +++ new/irssi-0.8.19/src/irc/core/irc-servers.c 2016-03-23 00:08:36.000000000 +0100 @@ -78,17 +78,23 @@ IRC_SERVER_REC *irc_server = (IRC_SERVER_REC *) server; char *chantypes, *statusmsg; + g_return_val_if_fail(data != NULL, FALSE); + + /* empty string is no channel */ + if (*data == '\0') + return FALSE; + chantypes = g_hash_table_lookup(irc_server->isupport, "chantypes"); if (chantypes == NULL) chantypes = "#&!+"; /* normal, local, secure, modeless */ - statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg"); - if (statusmsg == NULL) - statusmsg = "@+"; - while (strchr(statusmsg, *data) != NULL) - data++; + statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg"); + if (statusmsg != NULL) + data += strspn(data, statusmsg); - return strchr(chantypes, *data) != NULL; + /* strchr(3) considers the trailing NUL as part of the string, make sure + * we didn't advance too much. */ + return *data != '\0' && strchr(chantypes, *data) != NULL; } static char **split_line(const SERVER_REC *server, const char *line, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/src/irc/core/sasl.c new/irssi-0.8.19/src/irc/core/sasl.c --- old/irssi-0.8.18/src/irc/core/sasl.c 2016-01-20 23:08:07.000000000 +0100 +++ new/irssi-0.8.19/src/irc/core/sasl.c 2016-03-23 00:08:35.000000000 +0100 @@ -34,7 +34,7 @@ irc_send_cmd_now(server, "AUTHENTICATE *"); cap_finish_negotiation(server); - server->sasl_timeout = -1; + server->sasl_timeout = 0; signal_emit("server sasl failure", 2, server, "The authentication timed out"); @@ -64,9 +64,9 @@ char *params, *error; /* Stop any pending timeout, if any */ - if (server->sasl_timeout != -1) { + if (server->sasl_timeout != 0) { g_source_remove(server->sasl_timeout); - server->sasl_timeout = -1; + server->sasl_timeout = 0; } params = event_get_params(data, 2, NULL, &error); @@ -81,9 +81,9 @@ static void sasl_already(IRC_SERVER_REC *server, const char *data, const char *from) { - if (server->sasl_timeout != -1) { + if (server->sasl_timeout != 0) { g_source_remove(server->sasl_timeout); - server->sasl_timeout = -1; + server->sasl_timeout = 0; } signal_emit("server sasl success", 1, server); @@ -94,9 +94,9 @@ static void sasl_success(IRC_SERVER_REC *server, const char *data, const char *from) { - if (server->sasl_timeout != -1) { + if (server->sasl_timeout != 0) { g_source_remove(server->sasl_timeout); - server->sasl_timeout = -1; + server->sasl_timeout = 0; } signal_emit("server sasl success", 1, server); @@ -114,9 +114,9 @@ conn = server->connrec; /* Stop the timer */ - if (server->sasl_timeout != -1) { + if (server->sasl_timeout != 0) { g_source_remove(server->sasl_timeout); - server->sasl_timeout = -1; + server->sasl_timeout = 0; } switch (conn->sasl_mechanism) { @@ -145,7 +145,7 @@ case SASL_MECHANISM_EXTERNAL: /* Empty response */ - irc_send_cmdv(server, "+"); + irc_send_cmdv(server, "AUTHENTICATE +"); break; } @@ -153,6 +153,20 @@ server->sasl_timeout = g_timeout_add(SASL_TIMEOUT, (GSourceFunc) sasl_timeout, server); } +static void sasl_disconnected(IRC_SERVER_REC *server) +{ + g_return_if_fail(server != NULL); + + if (!IS_IRC_SERVER(server)) { + return; + } + + if (server->sasl_timeout != 0) { + g_source_remove(server->sasl_timeout); + server->sasl_timeout = 0; + } +} + void sasl_init(void) { signal_add_first("server cap ack sasl", (SIGNAL_FUNC) sasl_start); @@ -163,6 +177,7 @@ signal_add_first("event 905", (SIGNAL_FUNC) sasl_fail); signal_add_first("event 906", (SIGNAL_FUNC) sasl_fail); signal_add_first("event 907", (SIGNAL_FUNC) sasl_already); + signal_add_first("server disconnected", (SIGNAL_FUNC) sasl_disconnected); } void sasl_deinit(void) @@ -175,4 +190,5 @@ signal_remove("event 905", (SIGNAL_FUNC) sasl_fail); signal_remove("event 906", (SIGNAL_FUNC) sasl_fail); signal_remove("event 907", (SIGNAL_FUNC) sasl_already); + signal_remove("server disconnected", (SIGNAL_FUNC) sasl_disconnected); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-0.8.18/src/irc/dcc/dcc.c new/irssi-0.8.19/src/irc/dcc/dcc.c --- old/irssi-0.8.18/src/irc/dcc/dcc.c 2016-01-20 23:08:07.000000000 +0100 +++ new/irssi-0.8.19/src/irc/dcc/dcc.c 2016-03-23 00:08:36.000000000 +0100 @@ -496,8 +496,8 @@ g_return_if_fail(data != NULL); - if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST | - PARAM_FLAG_STRIP_TRAILING_WS, &typestr, &nick, &arg)) + if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST, + &typestr, &nick, &arg)) return; if (*nick == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);

1 0

commit afl for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '16

31 Mar '16

Hello community, here is the log from the commit of package afl for openSUSE:Factory checked in at 2016-03-31 13:03:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/afl (Old) and /work/SRC/openSUSE:Factory/.afl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "afl" Changes: -------- --- /work/SRC/openSUSE:Factory/afl/afl.changes 2016-03-01 10:20:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.afl.new/afl.changes 2016-03-31 13:03:14.000000000 +0200 @@ -1,0 +2,30 @@ +Mon Mar 28 19:11:03 UTC 2016 - mpluskal(a)suse.com + +- Update to 2.09b + * Made several documentation updates. + * Added some visual indicators to promote and simplify the use + of -Z. +- Changes for 2.08b + * Added explicit support for -m32 and -m64 for llvm_mode. + Inspired by a request from Christian Holler. + * Added a new benchmarking option, as requested by Kostya + Serebryany. +- Changes for 2.07b + * Added CPU affinity option (-Z) on Linux. With some caution, + this can offer a significant (10%+) performance bump and + reduce jitter. Proposed by Austin Seipp. + * Updated afl-gotcpu to use CPU affinity where supported. + * Fixed confusing CPU_TARGET error messages with QEMU build. + Spotted by Daniel Komaromy and others. +- Changes for 2.06b + * Worked around LLVM persistent mode hiccups with -shared code. + Contributed by Christian Holler. + * Added __AFL_COMPILER as a convenient way to detect that + something is built under afl-gcc / afl-clang / afl-clang-fast + and enable custom optimizations in your code. Suggested by + Pedro Corte-Real. + * Upstreamed several minor changes developed by Franjo Ivancic to + allow AFL to be built as a library. This is fairly use-specific + and may have relatively little appeal to general audiences. + +------------------------------------------------------------------- Old: ---- afl-2.05b.tgz New: ---- afl-2.09b.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ afl.spec ++++++ --- /var/tmp/diff_new_pack.SVZiNL/_old 2016-03-31 13:03:15.000000000 +0200 +++ /var/tmp/diff_new_pack.SVZiNL/_new 2016-03-31 13:03:15.000000000 +0200 @@ -17,7 +17,7 @@ Name: afl -Version: 2.05b +Version: 2.09b Release: 0 Summary: American fuzzy lop is a security-oriented fuzzer License: Apache-2.0 @@ -41,10 +41,10 @@ %build export CFLAGS="$CFLAGS %{optflags}" -make PREFIX=%{_prefix} LIBEXEC_DIR=%{_libexecdir} DOC_DIR=%{_docdir} %{?_smp_mflags} +make %{?_smp_mflags} PREFIX=%{_prefix} LIBEXEC_DIR=%{_libexecdir} DOC_DIR=%{_docdir} %install -make PREFIX=%{_prefix} LIBEXEC_DIR=%{_libexecdir} DOC_DIR=%{_docdir} DESTDIR=%{buildroot} install %{?_smp_mflags} +make %{?_smp_mflags} PREFIX=%{_prefix} LIBEXEC_DIR=%{_libexecdir} DOC_DIR=%{_docdir} DESTDIR=%{buildroot} install %files %defattr(-,root,root) ++++++ afl-2.05b.tgz -> afl-2.09b.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/afl-2.05b/Makefile new/afl-2.09b/Makefile --- old/afl-2.05b/Makefile 2016-02-24 23:45:50.000000000 +0100 +++ new/afl-2.09b/Makefile 2016-03-26 23:08:53.000000000 +0100 @@ -14,7 +14,7 @@ # PROGNAME = afl -VERSION = 2.05b +VERSION = 2.09b PREFIX ?= /usr/local BIN_PATH = $(PREFIX)/bin @@ -103,6 +103,7 @@ endif all_done: test_build + @if [ ! "`which clang 2>/dev/null`" = "" ]; then echo "[+] LLVM users: see llvm_mode/README.llvm for a faster alternative to afl-gcc."; fi @echo "[+] All done! Be sure to review README - it's pretty short and useful." @if [ "`uname`" = "Darwin" ]; then printf "\nWARNING: Fuzzing on MacOS X is slow because of the unusually high overhead of\nfork() on this OS. Consider using Linux or *BSD. You can also use VirtualBox\n(virtualbox.org) to put AFL inside a Linux or *BSD VM.\n\n"; fi @! tty <&1 >/dev/null || printf "\033[0;30mNOTE: If you can read this, your terminal probably uses white background.\nThis will make the UI hard to read. See docs/status_screen.txt for advice.\033[0m\n" 2>/dev/null @@ -121,6 +122,8 @@ rm -f $${DESTDIR}$(BIN_PATH)/afl-as if [ -f afl-qemu-trace ]; then install -m 755 afl-qemu-trace $${DESTDIR}$(BIN_PATH); fi if [ -f afl-clang-fast -a -f afl-llvm-pass.so -a -f afl-llvm-rt.o ]; then set -e; install -m 755 afl-clang-fast $${DESTDIR}$(BIN_PATH); ln -sf afl-clang-fast $${DESTDIR}$(BIN_PATH)/afl-clang-fast++; install -m 755 afl-llvm-pass.so afl-llvm-rt.o $${DESTDIR}$(HELPER_PATH); fi + if [ -f afl-llvm-rt-32.o ]; then set -e; install -m 755 afl-llvm-rt-32.o $${DESTDIR}$(HELPER_PATH); fi + if [ -f afl-llvm-rt-64.o ]; then set -e; install -m 755 afl-llvm-rt-64.o $${DESTDIR}$(HELPER_PATH); fi set -e; for i in afl-g++ afl-clang afl-clang++; do ln -sf afl-gcc $${DESTDIR}$(BIN_PATH)/$$i; done install -m 755 afl-as $${DESTDIR}$(HELPER_PATH) ln -sf afl-as $${DESTDIR}$(HELPER_PATH)/as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/afl-2.05b/afl-fuzz.c new/afl-2.09b/afl-fuzz.c --- old/afl-2.05b/afl-fuzz.c 2016-02-21 06:41:16.000000000 +0100 +++ new/afl-2.09b/afl-fuzz.c 2016-03-26 23:07:40.000000000 +0100 @@ -44,6 +44,7 @@ #include <fcntl.h> #include <termios.h> #include <dlfcn.h> +#include <sched.h> #include <sys/wait.h> #include <sys/time.h> @@ -59,11 +60,26 @@ # include <sys/sysctl.h> #endif /* __APPLE__ || __FreeBSD__ || __OpenBSD__ */ +/* For supporting -Z on systems that have sched_setaffinity. */ + +#ifdef __linux__ +# define HAVE_AFFINITY 1 +#endif /* __linux__ */ + +/* A toggle to export some variables when building as a library. Not very + useful for the general public. */ + +#ifdef AFL_LIB +# define EXP_ST +#else +# define EXP_ST static +#endif /* ^AFL_LIB */ /* Lots of globals, but mostly for the status UI and other things where it really makes no sense to haul them around as function parameters. */ -static u8 *in_dir, /* Input directory with test cases */ + +EXP_ST u8 *in_dir, /* Input directory with test cases */ *out_file, /* File to fuzz, if any */ *out_dir, /* Working & output directory */ *sync_dir, /* Synchronization directory */ @@ -74,12 +90,12 @@ *target_path, /* Path to target binary */ *orig_cmdline; /* Original command line */ -static u32 exec_tmout = EXEC_TIMEOUT; /* Configurable exec timeout (ms) */ -static u64 mem_limit = MEM_LIMIT; /* Memory cap for child (MB) */ +EXP_ST u32 exec_tmout = EXEC_TIMEOUT; /* Configurable exec timeout (ms) */ +EXP_ST u64 mem_limit = MEM_LIMIT; /* Memory cap for child (MB) */ static u32 stats_update_freq = 1; /* Stats update frequency (execs) */ -static u8 skip_deterministic, /* Skip deterministic stages? */ +EXP_ST u8 skip_deterministic, /* Skip deterministic stages? */ force_deterministic, /* Force deterministic stages? */ use_splicing, /* Recombine input files? */ dumb_mode, /* Run in non-instrumented mode? */ @@ -112,9 +128,9 @@ child_pid = -1, /* PID of the fuzzed program */ out_dir_fd = -1; /* FD of the lock file */ -static u8* trace_bits; /* SHM with instrumentation bitmap */ +EXP_ST u8* trace_bits; /* SHM with instrumentation bitmap */ -static u8 virgin_bits[MAP_SIZE], /* Regions yet untouched by fuzzing */ +EXP_ST u8 virgin_bits[MAP_SIZE], /* Regions yet untouched by fuzzing */ virgin_hang[MAP_SIZE], /* Bits we haven't seen in hangs */ virgin_crash[MAP_SIZE]; /* Bits we haven't seen in crashes */ @@ -124,7 +140,7 @@ clear_screen = 1, /* Window resized? */ child_timed_out; /* Traced process timed out? */ -static u32 queued_paths, /* Total number of queued testcases */ +EXP_ST u32 queued_paths, /* Total number of queued testcases */ queued_variable, /* Testcases with variable behavior */ queued_at_start, /* Total number of initial inputs */ queued_discovered, /* Items discovered during this run */ @@ -140,7 +156,7 @@ current_entry, /* Current queue entry ID */ havoc_div = 1; /* Cycle count divisor for havoc */ -static u64 total_crashes, /* Total number of crashes */ +EXP_ST u64 total_crashes, /* Total number of crashes */ unique_crashes, /* Crashes with unique signatures */ total_hangs, /* Total number of hangs */ unique_hangs, /* Hangs with unique signatures */ @@ -186,6 +202,15 @@ static u32 cpu_core_count; /* CPU core count */ +#ifdef HAVE_AFFINITY + +static u8 use_affinity; /* Using -Z */ + +static u32 cpu_aff_main, /* Affinity for main process */ + cpu_aff_child; /* Affinity for fuzzed child */ + +#endif /* HAVE_AFFINITY */ + static FILE* plot_file; /* Gnuplot output file */ struct queue_entry { @@ -315,6 +340,25 @@ } +#ifdef HAVE_AFFINITY + +/* Set CPU affinity (on systems that support it). */ + +static void set_cpu_affinity(u32 cpu_id) { + + cpu_set_t c; + + CPU_ZERO(&c); + CPU_SET(cpu_id, &c); + + if (sched_setaffinity(0, sizeof(c), &c)) + PFATAL("sched_setaffinity failed"); + +} + +#endif /* HAVE_AFFINITY */ + + /* Generate a random number (from 0 to limit - 1). This may have slight bias. */ @@ -659,7 +703,7 @@ /* Destroy the entire queue. */ -static void destroy_queue(void) { +EXP_ST void destroy_queue(void) { struct queue_entry *q = queue, *n; @@ -680,7 +724,7 @@ -B option, to focus a separate fuzzing session on a particular interesting input without rediscovering all the others. */ -static void write_bitmap(void) { +EXP_ST void write_bitmap(void) { u8* fname; s32 fd; @@ -703,7 +747,7 @@ /* Read bitmap from file. This is for the -B option again. */ -static void read_bitmap(u8* fname) { +EXP_ST void read_bitmap(u8* fname) { s32 fd = open(fname, O_RDONLY); @@ -1200,7 +1244,7 @@ /* Configure shared memory and virgin_bits. This is called at startup. */ -static void setup_shm(void) { +EXP_ST void setup_shm(void) { u8* shm_str; @@ -1834,7 +1878,7 @@ cloning a stopped child. So, we just execute once, and then send commands through a pipe. The other part of this logic is in afl-as.h. */ -static void init_forkserver(char** argv) { +EXP_ST void init_forkserver(char** argv) { static struct itimerval it; int st_pipe[2], ctl_pipe[2]; @@ -1853,6 +1897,10 @@ struct rlimit r; +#ifdef HAVE_AFFINITY + if (use_affinity) set_cpu_affinity(cpu_aff_child); +#endif /* HAVE_AFFINITY */ + /* Umpf. On OpenBSD, the default fd limit for root users is set to soft 128. Let's try to fix that... */ @@ -2151,6 +2199,10 @@ struct rlimit r; +#ifdef HAVE_AFFINITY + if (use_affinity) set_cpu_affinity(cpu_aff_child); +#endif /* HAVE_AFFINITY */ + if (mem_limit) { r.rlim_max = r.rlim_cur = ((rlim_t)mem_limit) << 20; @@ -3730,11 +3782,13 @@ } - /* Honor AFL_EXIT_WHEN_DONE. */ + /* Honor AFL_EXIT_WHEN_DONE and AFL_BENCH_UNTIL_CRASH. */ if (!dumb_mode && cycles_wo_finds > 20 && !pending_not_fuzzed && getenv("AFL_EXIT_WHEN_DONE")) stop_soon = 2; + if (total_crashes && getenv("AFL_BENCH_UNTIL_CRASH")) stop_soon = 2; + /* If we're not on TTY, bail out. */ if (not_on_tty) return; @@ -4076,8 +4130,26 @@ if (!no_cpu_meter_red && cur_utilization >= 150) cpu_color = cLRD; +#ifdef HAVE_AFFINITY + + if (use_affinity) { + + SAYF(SP10 cGRA "[cpu@%02u:%s%3u%%" cGRA "]\r" cRST, + MIN(cpu_aff_child, 99), cpu_color, + MIN(cur_utilization, 999)); + + } else { + + SAYF(SP10 cGRA " [cpu:%s%3u%%" cGRA "]\r" cRST, + cpu_color, MIN(cur_utilization, 999)); + + } +#else + SAYF(SP10 cGRA " [cpu:%s%3u%%" cGRA "]\r" cRST, - cpu_color, cur_utilization < 999 ? cur_utilization : 999); + cpu_color, MIN(cur_utilization, 999)); + +#endif /* ^HAVE_AFFINITY */ } else SAYF("\r"); @@ -4331,7 +4403,7 @@ error conditions, returning 1 if it's time to bail out. This is a helper function for fuzz_one(). */ -static u8 common_fuzz_stuff(char** argv, u8* out_buf, u32 len) { +EXP_ST u8 common_fuzz_stuff(char** argv, u8* out_buf, u32 len) { u8 fault; @@ -6504,7 +6576,7 @@ isn't a shell script - a common and painful mistake. We also check for a valid ELF header and for evidence of AFL instrumentation. */ -static void check_binary(u8* fname) { +EXP_ST void check_binary(u8* fname) { u8* env_path = 0; struct stat st; @@ -6761,6 +6833,9 @@ " -T text - text banner to show on the screen\n" " -M / -S id - distributed mode (see parallel_fuzzing.txt)\n" +#ifdef HAVE_AFFINITY + " -Z core_id - set CPU affinity (see perf_tips.txt)\n" +#endif /* HAVE_AFFINITY */ " -C - crash exploration mode (the peruvian rabbit thing)\n\n" "For additional tips, please consult %s/README.\n\n", @@ -6774,7 +6849,7 @@ /* Prepare output directories and fds. */ -static void setup_dirs_fds(void) { +EXP_ST void setup_dirs_fds(void) { u8* tmp; s32 fd; @@ -6894,7 +6969,7 @@ /* Setup the output file for fuzzed data, if not using -f. */ -static void setup_stdio_file(void) { +EXP_ST void setup_stdio_file(void) { u8* fn = alloc_printf("%s/.cur_input", out_dir); @@ -7104,6 +7179,16 @@ } else WARNF("Unable to figure out the number of CPU cores."); +#ifdef HAVE_AFFINITY + + if (use_affinity) + OKF("Using specified CPU affinity: main = %u, child = %u", + cpu_aff_main, cpu_aff_child); + else if (cpu_core_count > 1) + OKF(cBRI "Try setting CPU affinity (-Z) for a performance boost!" cRST); + +#endif /* HAVE_AFFINITY */ + } @@ -7189,7 +7274,7 @@ /* Detect @@ in args. */ -static void detect_file_args(char** argv) { +EXP_ST void detect_file_args(char** argv) { u32 i = 0; u8* cwd = getcwd(NULL, 0); @@ -7238,7 +7323,7 @@ Solaris doesn't resume interrupted reads(), sets SA_RESETHAND when you call siginterrupt(), and does other stupid things. */ -static void setup_signal_handlers(void) { +EXP_ST void setup_signal_handlers(void) { struct sigaction sa; @@ -7376,6 +7461,8 @@ } +#ifndef AFL_LIB + /* Main entry point */ int main(int argc, char** argv) { @@ -7393,7 +7480,7 @@ doc_path = access(DOC_PATH, F_OK) ? "docs" : DOC_PATH; - while ((opt = getopt(argc, argv, "+i:o:f:m:t:T:dnCB:S:M:x:Q")) > 0) + while ((opt = getopt(argc, argv, "+i:o:f:m:t:T:dnCB:S:M:x:QZ:")) > 0) switch (opt) { @@ -7489,6 +7576,35 @@ break; +#ifdef HAVE_AFFINITY + + case 'Z': { + + s32 i; + + if (use_affinity) FATAL("Multiple -Z options not supported"); + use_affinity = 1; + + cpu_core_count = sysconf(_SC_NPROCESSORS_ONLN); + + i = sscanf(optarg, "%u,%u", &cpu_aff_main, &cpu_aff_child); + + if (i < 1 || cpu_aff_main >= cpu_core_count) + FATAL("Bogus primary core ID passed to -Z (expected 0-%u)", + cpu_core_count - 1); + + if (i == 1) cpu_aff_child = cpu_aff_main; + + if (cpu_aff_child >= cpu_core_count) + FATAL("Bogus secondary core ID passed to -Z (expected 0-%u)", + cpu_core_count - 1); + + break; + + } + +#endif /* HAVE_AFFINITY */ + case 'd': if (skip_deterministic) FATAL("Multiple -d options not supported"); @@ -7554,6 +7670,10 @@ setup_signal_handlers(); check_asan_opts(); +#ifdef HAVE_AFFINITY + if (use_affinity) set_cpu_affinity(cpu_aff_main); +#endif /* HAVE_AFFINITY */ + if (sync_id) fix_up_sync(); if (!strcmp(in_dir, out_dir)) @@ -7727,3 +7847,5 @@ exit(0); } + +#endif /* !AFL_LIB */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/afl-2.05b/afl-gcc.c new/afl-2.09b/afl-gcc.c --- old/afl-2.05b/afl-gcc.c 2016-02-10 16:49:13.000000000 +0100 +++ new/afl-2.09b/afl-gcc.c 2016-03-05 01:08:50.000000000 +0100 @@ -116,7 +116,7 @@ u8 m32_set = 0; #endif - cc_params = ck_alloc((argc + 16) * sizeof(u8*)); + cc_params = ck_alloc((argc + 64) * sizeof(u8*)); name = strrchr(argv[0], '/'); if (!name) name = argv[0]; else name++; @@ -262,6 +262,7 @@ cc_params[cc_par_cnt++] = "-O3"; cc_params[cc_par_cnt++] = "-funroll-loops"; + cc_params[cc_par_cnt++] = "-D__AFL_COMPILER=1"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/afl-2.05b/afl-gotcpu.c new/afl-2.09b/afl-gotcpu.c --- old/afl-2.05b/afl-gotcpu.c 2016-02-10 16:46:49.000000000 +0100 +++ new/afl-2.09b/afl-gotcpu.c 2016-03-08 08:09:26.000000000 +0100 @@ -4,7 +4,7 @@ Written and maintained by Michal Zalewski <lcamtuf(a)google.com> - Copyright 2015 Google Inc. All rights reserved. + Copyright 2015, 2016 Google Inc. All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,10 +26,12 @@ */ #define AFL_MAIN +#define _GNU_SOURCE #include <stdio.h> #include <stdlib.h> #include <unistd.h> +#include <string.h> #include <sched.h> #include <sys/time.h> @@ -39,6 +41,10 @@ #include "types.h" #include "debug.h" +#ifdef __linux__ +# define HAVE_AFFINITY 1 +#endif /* __linux__ */ + /* Get unix time in microseconds. */ @@ -68,21 +74,14 @@ } -/* Do the benchmark thing. */ +/* Measure preemption rate. */ -int main(int argc, char** argv) { +static u32 measure_preemption(u32 target_ms) { static volatile u32 v1, v2; - s32 loop_repeats = 0, util_perc; u64 st_t, en_t, st_c, en_c, real_delta, slice_delta; - - SAYF(cCYA "afl-gotcpu " cBRI VERSION cRST " by <lcamtuf(a)google.com>\n"); - - /* Run a busy loop for CTEST_TARGET_MS. */ - - ACTF("Measuring preemption rate (this will take %0.02f sec)...", - ((double)CTEST_TARGET_MS) / 1000); + s32 loop_repeats = 0; st_t = get_cur_time_us(); st_c = get_cpu_usage_us(); @@ -96,7 +95,7 @@ en_t = get_cur_time_us(); - if (en_t - st_t < CTEST_TARGET_MS * 1000) { + if (en_t - st_t < target_ms * 1000) { loop_repeats++; goto repeat_loop; } @@ -109,10 +108,104 @@ real_delta = (en_t - st_t) / 1000; slice_delta = (en_c - st_c) / 1000; - OKF("Busy loop hit %u times, real = %llu ms, slice = %llu ms.", - loop_repeats, real_delta, slice_delta); + return real_delta * 100 / slice_delta; + +} + + +/* Do the benchmark thing. */ + +int main(int argc, char** argv) { + +#ifdef HAVE_AFFINITY + + u32 cpu_cnt = sysconf(_SC_NPROCESSORS_ONLN), + idle_cpus = 0, maybe_cpus = 0, i; + + SAYF(cCYA "afl-gotcpu " cBRI VERSION cRST " by <lcamtuf(a)google.com>\n"); + + ACTF("Measuring per-core preemption rate (this will take %0.02f sec)...", + ((double)CTEST_CORE_TRG_MS) * cpu_cnt / 1000); + + for (i = 0; i < cpu_cnt; i++) { + + cpu_set_t c; + u32 util_perc; + + CPU_ZERO(&c); + CPU_SET(i, &c); + + if (sched_setaffinity(0, sizeof(c), &c)) + PFATAL("sched_setaffinity failed"); + + util_perc = measure_preemption(CTEST_CORE_TRG_MS); + + if (util_perc < 105) { + + SAYF(" Core #%u: " cLGN "AVAILABLE\n" cRST, i); + maybe_cpus++; + idle_cpus++; + + } else if (util_perc < 130) { + + SAYF(" Core #%u: " cYEL "CAUTION " cRST "(%u%%)\n", i, util_perc); + maybe_cpus++; + + } else { - util_perc = real_delta * 100 / slice_delta; + SAYF(" Core #%u: " cLRD "OVERBOOKED " cRST "(%u%%)\n" cRST, i, + util_perc); + + } + + } + + SAYF(cGRA "\n>>> "); + + if (idle_cpus) { + + if (maybe_cpus == idle_cpus) { + + SAYF(cLGN "PASS: " cRST "You can run more processes on %u core%s.", + idle_cpus, idle_cpus > 1 ? "s" : ""); + + } else { + + SAYF(cLGN "PASS: " cRST "You can run more processes on %u to %u core%s.", + idle_cpus, maybe_cpus, maybe_cpus > 1 ? "s" : ""); + + } + + SAYF(cGRA " <<<" cRST "\n\n"); + return 0; + + } + + if (maybe_cpus) { + + SAYF(cYEL "CAUTION: " cRST "You may still have %u core%s available.", + maybe_cpus, maybe_cpus > 1 ? "s" : ""); + SAYF(cGRA " <<<" cRST "\n\n"); + return 1; + + } + + SAYF(cLRD "FAIL: " cRST "All cores are overbooked."); + SAYF(cGRA " <<<" cRST "\n\n"); + return 2; + +#else + + u32 util_perc; + + SAYF(cCYA "afl-gotcpu " cBRI VERSION cRST " by <lcamtuf(a)google.com>\n"); + + /* Run a busy loop for CTEST_TARGET_MS. */ + + ACTF("Measuring gross preemption rate (this will take %0.02f sec)...", + ((double)CTEST_TARGET_MS) / 1000); + + util_perc = measure_preemption(CTEST_TARGET_MS); /* Deliver the final verdict. */ @@ -137,4 +230,6 @@ return (util_perc > 105) + (util_perc > 130); +#endif /* ^HAVE_AFFINITY */ + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/afl-2.05b/config.h new/afl-2.09b/config.h --- old/afl-2.05b/config.h 2016-02-20 23:24:03.000000000 +0100 +++ new/afl-2.09b/config.h 2016-03-08 05:30:34.000000000 +0100 @@ -321,6 +321,7 @@ /* Constants for afl-gotcpu to control busy loop timing: */ #define CTEST_TARGET_MS 5000 +#define CTEST_CORE_TRG_MS 1000 #define CTEST_BUSY_CYCLES (10 * 1000 * 1000) /* Uncomment this to use inferior block-coverage-based instrumentation. Note diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/afl-2.05b/docs/ChangeLog new/afl-2.09b/docs/ChangeLog --- old/afl-2.05b/docs/ChangeLog 2016-02-24 23:07:22.000000000 +0100 +++ new/afl-2.09b/docs/ChangeLog 2016-03-26 23:08:34.000000000 +0100 @@ -13,10 +13,55 @@ sending a mail to <afl-users+subscribe(a)googlegroups.com>. Not sure if you should upgrade? The lowest currently recommended version -is 2.03b. If you're stuck on an earlier release, it's strongly advisable +is 2.07b. If you're stuck on an earlier release, it's strongly advisable to get on with the times. -------------- +Version 2.09b: +-------------- + + - Made several documentation updates. + + - Added some visual indicators to promote and simplify the use of -Z. + +-------------- +Version 2.08b: +-------------- + + - Added explicit support for -m32 and -m64 for llvm_mode. Inspired by + a request from Christian Holler. + + - Added a new benchmarking option, as requested by Kostya Serebryany. + +-------------- +Version 2.07b: +-------------- + + - Added CPU affinity option (-Z) on Linux. With some caution, this can + offer a significant (10%+) performance bump and reduce jitter. + Proposed by Austin Seipp. + + - Updated afl-gotcpu to use CPU affinity where supported. + + - Fixed confusing CPU_TARGET error messages with QEMU build. Spotted by + Daniel Komaromy and others. + +-------------- +Version 2.06b: +-------------- + + - Worked around LLVM persistent mode hiccups with -shared code. + Contributed by Christian Holler. + + - Added __AFL_COMPILER as a convenient way to detect that something is + built under afl-gcc / afl-clang / afl-clang-fast and enable custom + optimizations in your code. Suggested by Pedro Corte-Real. + + - Upstreamed several minor changes developed by Franjo Ivancic to + allow AFL to be built as a library. This is fairly use-specific and + may have relatively little appeal to general audiences. + +-------------- Version 2.05b: -------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/afl-2.05b/docs/README new/afl-2.09b/docs/README --- old/afl-2.05b/docs/README 2016-02-21 01:04:50.000000000 +0100 +++ new/afl-2.09b/docs/README 2016-03-15 16:21:42.000000000 +0100 @@ -256,6 +256,10 @@ For tips on how to fuzz a common target on multiple cores or multiple networked machines, please refer to parallel_fuzzing.txt. +The parallel fuzzing mode also offers a simple way for interfacing AFL to other +fuzzers, to symbolic or concolic execution engines, and so forth; again, see the +last section of parallel_fuzzing.txt for tips. + 9) Fuzzer dictionaries ---------------------- @@ -433,7 +437,8 @@ Jacek Wielemborek Leo Barnes Jeremy Barnes Jeff Trull Guillaume Endignoux ilovezfs - Daniel Godas-Lopez + Daniel Godas-Lopez Franjo Ivancic + Austin Seipp Daniel Komaromy Thank you! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/afl-2.05b/docs/env_variables.txt new/afl-2.09b/docs/env_variables.txt --- old/afl-2.05b/docs/env_variables.txt 2016-02-21 06:42:37.000000000 +0100 +++ new/afl-2.09b/docs/env_variables.txt 2016-03-11 03:30:04.000000000 +0100 @@ -146,7 +146,8 @@ Others need not apply. - Benchmarking only: AFL_BENCH_JUST_ONE causes the fuzzer to exit after - processing the first queue entry. + processing the first queue entry; and AFL_BENCH_UNTIL_CRASH causes it to + exit when first crash is found. 4) Settings for afl-qemu-trace ------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/afl-2.05b/docs/perf_tips.txt new/afl-2.09b/docs/perf_tips.txt --- old/afl-2.05b/docs/perf_tips.txt 2015-09-01 09:55:22.000000000 +0200 +++ new/afl-2.09b/docs/perf_tips.txt 2016-03-08 07:03:11.000000000 +0100 @@ -144,7 +144,29 @@ presented with pathological inputs. Low -m values can make them give up sooner and not waste CPU time. -8) Check OS configuration +8) Set CPU core affinity for AFL +-------------------------------- + +Making sure that the fuzzer always runs on the same (idle) CPU core can offer +a significant speed bump and reduce scheduler jitter. The benefits can be even +more striking on true multiprocessor systems. + +On Linux, you can assign the fuzzer to a specific core by first running +afl-gotcpu to see which cores are idle, and then specifying the ID of a +preferred core via -Z, like so: + + $ ./afl-fuzz -Z core_id [...other parameters...] + +Note that this parameter needs to be used with care; accidentally forcing +multiple fuzzers to share the same core may result in performance that is +worse than what you would get without -Z. + +(It is also possible to specify two comma-delimited values for -Z, in which +case, the fuzzer will run on one designated core, and the target binary will +be banished to another. This can sometimes offer minor benefits, but isn't +recommended for general use.) + +9) Check OS configuration ------------------------- There are several OS-level factors that may affect fuzzing speed: @@ -178,8 +200,8 @@ SCHED_RR - can usually speed things up, too, but needs to be done with care. -9) If all other options fail, use -d ------------------------------------- +10) If all other options fail, use -d +------------------------------------- For programs that are genuinely slow, in cases where you really can't escape using huge input files, or when you simply want to get quick and dirty results diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/afl-2.05b/docs/sister_projects.txt new/afl-2.09b/docs/sister_projects.txt --- old/afl-2.05b/docs/sister_projects.txt 2016-02-22 09:43:30.000000000 +0100 +++ new/afl-2.09b/docs/sister_projects.txt 2016-03-20 14:28:52.000000000 +0100 @@ -32,6 +32,14 @@ https://github.com/kmcallister/afl.rs +OCaml support (KC Sivaramakrishnan) +----------------------------------- + + Adds AFL-compatible instrumentation to OCaml programs. + + https://github.com/ocamllabs/opam-repo-dev/pull/23 + http://canopy.mirage.io/Posts/Fuzzing + AFL for GCJ Java and other GCC frontends (-) -------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/afl-2.05b/llvm_mode/Makefile new/afl-2.09b/llvm_mode/Makefile --- old/afl-2.05b/llvm_mode/Makefile 2016-02-21 02:49:14.000000000 +0100 +++ new/afl-2.09b/llvm_mode/Makefile 2016-03-12 23:29:27.000000000 +0100 @@ -55,9 +55,9 @@ endif ifndef AFL_TRACE_PC - PROGS = ../afl-clang-fast ../afl-llvm-pass.so ../afl-llvm-rt.o + PROGS = ../afl-clang-fast ../afl-llvm-pass.so ../afl-llvm-rt.o ../afl-llvm-rt-32.o ../afl-llvm-rt-64.o else - PROGS = ../afl-clang-fast ../afl-llvm-rt.o + PROGS = ../afl-clang-fast ../afl-llvm-rt.o ../afl-llvm-rt-32.o ../afl-llvm-rt-64.o endif all: test_deps $(PROGS) test_build all_done @@ -85,6 +85,14 @@ ../afl-llvm-rt.o: afl-llvm-rt.o.c | test_deps $(CC) $(CFLAGS) -fPIC -c $< -o $@ +../afl-llvm-rt-32.o: afl-llvm-rt.o.c | test_deps + @printf "[*] Building 32-bit variant of the runtime (-m32)... " + @$(CC) $(CFLAGS) -m32 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else echo "failed (that's fine)"; fi + +../afl-llvm-rt-64.o: afl-llvm-rt.o.c | test_deps + @printf "[*] Building 64-bit variant of the runtime (-m64)... " + @$(CC) $(CFLAGS) -m64 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else echo "failed (that's fine)"; fi + test_build: $(PROGS) @echo "[*] Testing the CC wrapper and instrumentation output..." unset AFL_USE_ASAN AFL_USE_MSAN; AFL_QUIET=1 AFL_INST_RATIO=100 AFL_PATH=. AFL_CC=$(CC) ../afl-clang-fast $(CFLAGS) ../test-instr.c -o test-instr $(LDFLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/afl-2.05b/llvm_mode/README.llvm new/afl-2.09b/llvm_mode/README.llvm --- old/afl-2.05b/llvm_mode/README.llvm 2016-02-21 03:30:35.000000000 +0100 +++ new/afl-2.09b/llvm_mode/README.llvm 2016-03-26 22:41:47.000000000 +0100 @@ -148,7 +148,9 @@ The numerical value specified within the loop controls the maximum number of iterations before AFL will restart the process from scratch. This minimizes -the impact of memory leaks and similar glitches; 1000 is a good starting point. +the impact of memory leaks and similar glitches; 1000 is a good starting point, +and going much higher increases the likelihood of hiccups without giving you +any real performance benefits. A more detailed template is shown in ../experimental/persistent_demo/. Similarly to the previous mode, the feature works only with afl-clang-fast; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/afl-2.05b/llvm_mode/afl-clang-fast.c new/afl-2.09b/llvm_mode/afl-clang-fast.c --- old/afl-2.05b/llvm_mode/afl-clang-fast.c 2016-02-21 21:19:23.000000000 +0100 +++ new/afl-2.09b/llvm_mode/afl-clang-fast.c 2016-03-12 23:38:56.000000000 +0100 @@ -96,7 +96,7 @@ static void edit_params(u32 argc, char** argv) { - u8 fortify_set = 0, asan_set = 0, x_set = 0, maybe_linking = 1; + u8 fortify_set = 0, asan_set = 0, x_set = 0, maybe_linking = 1, bit_mode = 0; u8 *name; cc_params = ck_alloc((argc + 64) * sizeof(u8*)); @@ -133,9 +133,8 @@ while (--argc) { u8* cur = *(++argv); -#if defined(__x86_64__) - if (!strcmp(cur, "-m32")) FATAL("-m32 is not supported"); -#endif + if (!strcmp(cur, "-m32")) bit_mode = 32; + if (!strcmp(cur, "-m64")) bit_mode = 64; if (!strcmp(cur, "-x")) x_set = 1; @@ -147,6 +146,8 @@ if (strstr(cur, "FORTIFY_SOURCE")) fortify_set = 1; + if (!strcmp(cur, "-shared")) maybe_linking = 0; + cc_params[cc_par_cnt++] = cur; } @@ -196,6 +197,7 @@ } cc_params[cc_par_cnt++] = "-D__AFL_HAVE_MANUAL_CONTROL=1"; + cc_params[cc_par_cnt++] = "-D__AFL_COMPILER=1"; /* When the user tries to use persistent or deferred forkserver modes by appending a single line to the program, we want to reliably inject a @@ -221,8 +223,10 @@ "({ static volatile char *_B __attribute__((used)); " " _B = (char*)\"" PERSIST_SIG "\"; " #ifdef __APPLE__ + "__attribute__((visibility(\"default\"))) " "int _L(unsigned int) __asm__(\"___afl_persistent_loop\"); " #else + "__attribute__((visibility(\"default\"))) " "int _L(unsigned int) __asm__(\"__afl_persistent_loop\"); " #endif /* ^__APPLE__ */ "_L(_A); })"; @@ -231,8 +235,10 @@ "do { static volatile char *_A __attribute__((used)); " " _A = (char*)\"" DEFER_SIG "\"; " #ifdef __APPLE__ + "__attribute__((visibility(\"default\"))) " "void _I(void) __asm__(\"___afl_manual_init\"); " #else + "__attribute__((visibility(\"default\"))) " "void _I(void) __asm__(\"__afl_manual_init\"); " #endif /* ^__APPLE__ */ "_I(); } while (0)"; @@ -244,7 +250,29 @@ cc_params[cc_par_cnt++] = "none"; } - cc_params[cc_par_cnt++] = alloc_printf("%s/afl-llvm-rt.o", obj_path); + switch (bit_mode) { + + case 0: + cc_params[cc_par_cnt++] = alloc_printf("%s/afl-llvm-rt.o", obj_path); + break; + + case 32: + cc_params[cc_par_cnt++] = alloc_printf("%s/afl-llvm-rt-32.o", obj_path); + + if (access(cc_params[cc_par_cnt - 1], R_OK)) + FATAL("-m32 is not supported by your compiler"); + + break; + + case 64: + cc_params[cc_par_cnt++] = alloc_printf("%s/afl-llvm-rt-64.o", obj_path); + + if (access(cc_params[cc_par_cnt - 1], R_OK)) + FATAL("-m64 is not supported by your compiler"); + + break; + + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/afl-2.05b/qemu_mode/build_qemu_support.sh new/afl-2.09b/qemu_mode/build_qemu_support.sh --- old/afl-2.05b/qemu_mode/build_qemu_support.sh 2015-04-30 05:34:59.000000000 +0200 +++ new/afl-2.09b/qemu_mode/build_qemu_support.sh 2016-03-08 08:10:20.000000000 +0100 @@ -6,7 +6,7 @@ # Written by Andrew Griffiths <agriffiths(a)google.com> and # Michal Zalewski <lcamtuf(a)google.com> # -# Copyright 2015 Google Inc. All rights reserved. +# Copyright 2015, 2016 Google Inc. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -124,6 +124,8 @@ echo "[+] Patching done." +ORIG_CPU_TARGET="$CPU_TARGET" + test "$CPU_TARGET" = "" && CPU_TARGET="`uname -m`" test "$CPU_TARGET" = "i686" && CPU_TARGET="i386" @@ -152,35 +154,43 @@ echo "[+] Successfully created '../afl-qemu-trace'." -echo "[*] Testing the build..." +if [ "$ORIG_CPU_TARGET" = "" ]; then -cd .. + echo "[*] Testing the build..." -make >/dev/null || exit 1 + cd .. -gcc test-instr.c -o test-instr || exit 1 + make >/dev/null || exit 1 -unset AFL_INST_RATIO + gcc test-instr.c -o test-instr || exit 1 -echo 0 | ./afl-showmap -m none -Q -q -o .test-instr0 ./test-instr || exit 1 -echo 1 | ./afl-showmap -m none -Q -q -o .test-instr1 ./test-instr || exit 1 + unset AFL_INST_RATIO -rm -f test-instr + echo 0 | ./afl-showmap -m none -Q -q -o .test-instr0 ./test-instr || exit 1 + echo 1 | ./afl-showmap -m none -Q -q -o .test-instr1 ./test-instr || exit 1 -cmp -s .test-instr0 .test-instr1 -DR="$?" + rm -f test-instr -rm -f .test-instr0 .test-instr1 + cmp -s .test-instr0 .test-instr1 + DR="$?" -if [ "$DR" = "0" ]; then + rm -f .test-instr0 .test-instr1 - echo "[-] Error: afl-qemu-trace instrumentation doesn't seem to work!" - exit 1 + if [ "$DR" = "0" ]; then -fi + echo "[-] Error: afl-qemu-trace instrumentation doesn't seem to work!" + exit 1 -echo "[+] Instrumentation tests passed. " + fi -echo "[+] All set, you can now use the -Q mode in afl-fuzz!" + echo "[+] Instrumentation tests passed. " + echo "[+] All set, you can now use the -Q mode in afl-fuzz!" + +else + + echo "[!] Note: can't test instrumentation when CPU_TARGET set." + echo "[+] All set, you can now (hopefully) use the -Q mode in afl-fuzz!" + +fi exit 0

1 0

commit nodejs-packaging for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '16

31 Mar '16

Hello community, here is the log from the commit of package nodejs-packaging for openSUSE:Factory checked in at 2016-03-31 13:03:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nodejs-packaging (Old) and /work/SRC/openSUSE:Factory/.nodejs-packaging.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nodejs-packaging" Changes: -------- --- /work/SRC/openSUSE:Factory/nodejs-packaging/nodejs-packaging.changes 2016-03-07 13:24:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nodejs-packaging.new/nodejs-packaging.changes 2016-03-31 13:03:13.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Mar 29 14:24:56 UTC 2016 - i(a)marguerite.su + +- update version v10.beta10 + * sometimes bower.json doesn't have dependencies tag + * fix encodings for nodejs-check.rb + * add --drop option to nodejs-fixdep.rb to drop dependency + +------------------------------------------------------------------- Old: ---- nodejs-packaging-10.beta9.tar.gz New: ---- nodejs-packaging-10.beta10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nodejs-packaging.spec ++++++ --- /var/tmp/diff_new_pack.TwaD6A/_old 2016-03-31 13:03:13.000000000 +0200 +++ /var/tmp/diff_new_pack.TwaD6A/_new 2016-03-31 13:03:13.000000000 +0200 @@ -18,7 +18,7 @@ %define _rpmconfigdir %{_prefix}/lib/rpm Name: nodejs-packaging -Version: 10.beta9 +Version: 10.beta10 Release: 0 Summary: Node.js Dependency generators for openSUSE License: MIT ++++++ nodejs-packaging-10.beta9.tar.gz -> nodejs-packaging-10.beta10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nodejs-packaging-10.beta9/TODO new/nodejs-packaging-10.beta10/TODO --- old/nodejs-packaging-10.beta9/TODO 2016-03-01 11:42:59.000000000 +0100 +++ new/nodejs-packaging-10.beta10/TODO 2016-03-28 11:45:24.000000000 +0200 @@ -2,3 +2,4 @@ + nodejs.prov and nodejs.req. npkg don't need to * support grunt auto tasks * support node-nsp security check +* support bower() in nodejs.prov diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nodejs-packaging-10.beta9/nodejs-check.rb new/nodejs-packaging-10.beta10/nodejs-check.rb --- old/nodejs-packaging-10.beta9/nodejs-check.rb 2016-03-01 11:42:59.000000000 +0100 +++ new/nodejs-packaging-10.beta10/nodejs-check.rb 2016-03-28 11:45:24.000000000 +0200 @@ -12,7 +12,7 @@ unless mod.nil? Dir.glob(buildroot + sitelib + "/**/package.json") do |f| - open(f) do |file| + open(f,"r:UTF-8") do |file| json = JSON.parse(file.read) unless json["dependencies"].nil? puts f if json["dependencies"].include?(mod) @@ -24,7 +24,7 @@ # check left-over bower.json dependencies Dir.glob(buildroot + sitelib + "/**/*") do |f| if f.end_with?("bower.json") - open(f) do |file| + open(f,"r:UTF-8") do |file| json = JSON.parse(file.read) unless json["dependencies"].nil? || json["dependencies"].empty? puts f.gsub(/^.*node_modules\//,'').gsub(/\/bower\.json/,'') + " has dependencies in bower.json, please do something" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nodejs-packaging-10.beta9/nodejs-fixdep.rb new/nodejs-packaging-10.beta10/nodejs-fixdep.rb --- old/nodejs-packaging-10.beta9/nodejs-fixdep.rb 2016-03-01 11:42:59.000000000 +0100 +++ new/nodejs-packaging-10.beta10/nodejs-fixdep.rb 2016-03-28 11:45:24.000000000 +0200 @@ -14,19 +14,35 @@ files << f end -pkgname = ARGV[0] -dep = ARGV[1] +if ARGV[0] == "--drop" + pkgname = ARGV[1] + dep = nil +else + pkgname = ARGV[0] + dep = ARGV[1] +end pkgjson = "" json = {} files.each do |f| + if ARGV[0] == "--drop" + # sometime the module needs to drop wasn't copyed to buildroot at all + File.open(f,'r:UTF-8') {|f| json = JSON.parse(f.read)} + unless json["dependencies"].nil? + unless json["dependencies"].keys.index(pkgname).nil? + json["dependencies"].delete_if {|i| i == pkgname} + File.open(f,'w:UTF-8') {|f1| f1.write JSON.pretty_generate(json) } + end + end + else if f.index(pkgname + "/package.json") # get its parent pkgjson = f.gsub('node_modules/' + pkgname + '/package.json','') + "package.json" if File.exist? pkgjson - File.open(pkgjson,'r:UTF-8') {|f| json = JSON.parse(f.read)} + File.open(pkgjson,'r:UTF-8') {|f1| json = JSON.parse(f1.read)} json["dependencies"][pkgname] = dep - File.open(pkgjson,'w:UTF-8') {|f| f.write JSON.pretty_generate(json) } + File.open(pkgjson,'w:UTF-8') {|f2| f2.write JSON.pretty_generate(json) } end end + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nodejs-packaging-10.beta9/tool/plugins/bower.rb new/nodejs-packaging-10.beta10/tool/plugins/bower.rb --- old/nodejs-packaging-10.beta9/tool/plugins/bower.rb 2016-03-01 11:42:59.000000000 +0100 +++ new/nodejs-packaging-10.beta10/tool/plugins/bower.rb 2016-03-28 11:45:24.000000000 +0200 @@ -34,7 +34,8 @@ json = dependency(name) jsonnew = {} - json.each do |k,v| + unless json.nil? || json.empty? + json.each do |k,v| url,j,version = "",{},"" file = Download.get("http://bower.herokuapp.com/packages/" + k) if File.exist?(file) @@ -84,6 +85,7 @@ end jsonnew[k] = url + end end return jsonnew @@ -93,7 +95,9 @@ def install(name="") json = lookup(name) - json.each do |k,v| + + unless json.nil? || json.empty? + json.each do |k,v| io = IO.popen("mkdir -p bower_components/#{k}") io.close io1 = IO.popen("wget #{v}") @@ -102,6 +106,7 @@ if File.exist? tarball FileUtils.mv tarball,"bower_components/#{k}/" end + end end if File.exist? "bower_components"

1 0

commit numatop for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '16

31 Mar '16

Hello community, here is the log from the commit of package numatop for openSUSE:Factory checked in at 2016-03-31 13:03:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/numatop (Old) and /work/SRC/openSUSE:Factory/.numatop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "numatop" Changes: -------- --- /work/SRC/openSUSE:Factory/numatop/numatop.changes 2015-03-09 10:10:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.numatop.new/numatop.changes 2016-03-31 13:03:09.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Mar 26 19:31:38 UTC 2016 - mpluskal(a)suse.com + +- Update to version 1.0.4 + * Add BDW-EP/EX support + +------------------------------------------------------------------- Old: ---- numatop_linux_1.0.3.tar.gz New: ---- numatop_linux_1.0.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ numatop.spec ++++++ --- /var/tmp/diff_new_pack.Mjc8ZM/_old 2016-03-31 13:03:10.000000000 +0200 +++ /var/tmp/diff_new_pack.Mjc8ZM/_new 2016-03-31 13:03:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package numatop # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,16 @@ Name: numatop -Version: 1.0.3 +Version: 1.0.4 Release: 0 Summary: A top-like tool for runtime memory locality monitoring on NUMA systems License: BSD-3-Clause Group: System/Monitoring Url: https://01.org/numatop Source0: https://01.org/sites/default/files/%{name}_linux_%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libnuma-devel BuildRequires: ncurses-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: x86_64 %description @@ -43,16 +43,20 @@ %setup -q -n %{name} %build -make CFLAGS="%optflags" %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="%{optflags}" %install mkdir -p %{buildroot}/%{_bindir} mkdir -p %{buildroot}/%{_mandir}/man8 -make PREFIXDIR=%{buildroot}/usr/ MANDIR=%{buildroot}/%{_mandir}/man8 install +make \ + %{?_smp_mflags} \ + PREFIXDIR=%{buildroot}%{_prefix} \ + MANDIR=%{buildroot}/%{_mandir}/man8 \ + install %files %defattr(-,root,root) %{_bindir}/%{name} -%{_mandir}/man8/* +%{_mandir}/man8/%{name}.8%{ext_man} %changelog ++++++ numatop_linux_1.0.3.tar.gz -> numatop_linux_1.0.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/README new/numatop/README --- old/numatop/README 2014-08-07 07:27:36.000000000 +0200 +++ new/numatop/README 2014-08-08 03:30:15.000000000 +0200 @@ -21,9 +21,12 @@ Kernel Requirement: ------------------ -Kernel: 3.13+ +Recommended kernel: 3.16 -For Haswell supporting, please also apply the following perf patch in kernel. +For Haswell supporting, please also apply a perf patch on 3.16. The patch +is numatop/kernel_patches/0001-perf-x86-Widen-Haswell-OFFCORE-mask.patch. + +The patch can also be found at following link: http://www.gossamer-threads.com/lists/linux/kernel/1964864 Directories @@ -36,6 +39,8 @@ generate memory access with runtime latency value among CPUs. Note that this application is only used for numatop testing! +kernel_patches: the required kernel patches. + Note: ----- numatop is supported on Intel Xeon processors: 5500-series, 6500/7500-series, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/common/disp.c new/numatop/common/disp.c --- old/numatop/common/disp.c 2014-07-01 02:40:53.000000000 +0200 +++ new/numatop/common/disp.c 2015-07-30 03:18:39.000000000 +0200 @@ -614,35 +614,35 @@ if (select(s_cons_ctl.pipe[0] + 1, &s_cons_ctl.fds, NULL, NULL, NULL) > 0) { if (FD_ISSET(s_cons_ctl.pipe[0], &s_cons_ctl.fds)) { - (void) read(s_cons_ctl.pipe[0], &ch, 1); - - /* - * Character is from pipe. - */ - if (ch == PIPE_CHAR_QUIT) { + if (read(s_cons_ctl.pipe[0], &ch, 1) == 1) { /* - * Received a QUIT notification, - * "console thread" will be quit + * Character is from pipe. */ - debug_print(NULL, 2, "cons: " - "received PIPE_CHAR_QUIT\n"); - break; - } + if (ch == PIPE_CHAR_QUIT) { + /* + * Received a QUIT notification, + * "console thread" will be quit + */ + debug_print(NULL, 2, "cons: " + "received PIPE_CHAR_QUIT\n"); + break; + } - if (ch == PIPE_CHAR_RESIZE) { - /* - * Send the "RESIZE" command - * to "display thread". - */ - (void) pthread_mutex_lock( - &s_disp_ctl.mutex); + if (ch == PIPE_CHAR_RESIZE) { + /* + * Send the "RESIZE" command + * to "display thread". + */ + (void) pthread_mutex_lock( + &s_disp_ctl.mutex); - CMD_ID_SET(&s_disp_ctl.cmd, - CMD_RESIZE_ID); + CMD_ID_SET(&s_disp_ctl.cmd, + CMD_RESIZE_ID); dispthr_flagset_nolock(DISP_FLAG_CMD); (void) pthread_mutex_unlock( &s_disp_ctl.mutex); + } } } else { /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/common/include/types.h new/numatop/common/include/types.h --- old/numatop/common/include/types.h 2014-08-05 08:00:32.000000000 +0200 +++ new/numatop/common/include/types.h 2015-07-30 06:26:20.000000000 +0200 @@ -51,10 +51,11 @@ CPU_NHM_EP, CPU_WSM_EP, CPU_IVB_EX, - CPU_HSX + CPU_HSX, + CPU_BDX } cpu_type_t; -#define CPU_TYPE_NUM 8 +#define CPU_TYPE_NUM 9 typedef enum { SORT_KEY_INVALID = -1, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/common/os/os_util.c new/numatop/common/os/os_util.c --- old/numatop/common/os/os_util.c 2014-07-01 02:40:53.000000000 +0200 +++ new/numatop/common/os/os_util.c 2015-07-30 03:18:39.000000000 +0200 @@ -196,7 +196,7 @@ calibrate_cpuinfo(double *nsofclk, uint64_t *clkofsec) { FILE *f; - char *line = NULL, unit[10]; + char *line = NULL, unit[11]; size_t len = 0; double freq = 0.0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/common/os/plat.c new/numatop/common/os/plat.c --- old/numatop/common/os/plat.c 2014-08-05 08:00:56.000000000 +0200 +++ new/numatop/common/os/plat.c 2015-07-30 06:27:20.000000000 +0200 @@ -51,6 +51,7 @@ nhmep_profiling_config, wsmep_profiling_config, snbep_profiling_config, + snbep_profiling_config, snbep_profiling_config }; @@ -63,6 +64,7 @@ nhmep_ll_config, wsmep_ll_config, snbep_ll_config, + snbep_ll_config, snbep_ll_config }; @@ -75,6 +77,7 @@ nhm_offcore_num, wsm_offcore_num, snb_offcore_num, + snb_offcore_num, snb_offcore_num }; @@ -105,6 +108,8 @@ case CPU_IVB_EX: /* fall through */ case CPU_HSX: + /* fall through */ + case CPU_BDX: return (0); default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/common/reg.c new/numatop/common/reg.c --- old/numatop/common/reg.c 2014-07-01 02:40:53.000000000 +0200 +++ new/numatop/common/reg.c 2015-07-30 03:18:39.000000000 +0200 @@ -402,6 +402,7 @@ { (void) initscr(); (void) refresh(); + (void) use_default_colors(); (void) start_color(); (void) keypad(stdscr, TRUE); (void) nonl(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/common/util.c new/numatop/common/util.c --- old/numatop/common/util.c 2014-08-05 08:46:31.000000000 +0200 +++ new/numatop/common/util.c 2015-07-30 06:28:31.000000000 +0200 @@ -396,6 +396,9 @@ case 63: type = CPU_HSX; break; + case 79: + type = CPU_BDX; + break; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/kernel_patches/0001-perf-x86-Widen-Haswell-OFFCORE-mask.patch new/numatop/kernel_patches/0001-perf-x86-Widen-Haswell-OFFCORE-mask.patch --- old/numatop/kernel_patches/0001-perf-x86-Widen-Haswell-OFFCORE-mask.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/numatop/kernel_patches/0001-perf-x86-Widen-Haswell-OFFCORE-mask.patch 2014-08-08 03:32:00.000000000 +0200 @@ -0,0 +1,54 @@ +From 1124c7b559c86dd9fadee30e635909f19d6b62e6 Mon Sep 17 00:00:00 2001 +From: Andi Kleen <ak(a)linux.intel.com> +Date: Tue, 5 Aug 2014 10:24:18 +0800 +Subject: [PATCH] perf, x86: Widen Haswell OFFCORE mask + +Haswell supports more bits in the offcore_rsp_* MSRs than Sandy +Bridge. Previously the Haswell code was using the Sandy Bridge +extra register definitions, which prevented users from setting +all of these bits. This in term did not allow to set some valid +SNOOP_* bits, among others. + +I allowed all bits the CPU does not #GP on. This is ok because +it's protected by a model check. + +Add a new extra_regs table for Haswell and use. Except for the +widened mask it is identical to Sandy Bridge. + +Signed-off-by: Andi Kleen <ak(a)linux.intel.com> +Signed-off-by: Jin Yao <yao.jin(a)linux.intel.com> +--- + arch/x86/kernel/cpu/perf_event_intel.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c +index 2502d0d..4f69013 100644 +--- a/arch/x86/kernel/cpu/perf_event_intel.c ++++ b/arch/x86/kernel/cpu/perf_event_intel.c +@@ -189,6 +189,14 @@ static struct extra_reg intel_snbep_extra_regs[] __read_mostly = { + EVENT_EXTRA_END + }; + ++static struct extra_reg intel_hsw_extra_regs[] __read_mostly = { ++ /* must define OFFCORE_RSP_X first, see intel_fixup_er() */ ++ INTEL_UEVENT_EXTRA_REG(0x01b7, MSR_OFFCORE_RSP_0, 0x3fffff8fffull, RSP_0), ++ INTEL_UEVENT_EXTRA_REG(0x01bb, MSR_OFFCORE_RSP_1, 0x3fffff8fffull, RSP_1), ++ INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x01cd), ++ EVENT_EXTRA_END ++}; ++ + EVENT_ATTR_STR(mem-loads, mem_ld_nhm, "event=0x0b,umask=0x10,ldlat=3"); + EVENT_ATTR_STR(mem-loads, mem_ld_snb, "event=0xcd,umask=0x1,ldlat=3"); + EVENT_ATTR_STR(mem-stores, mem_st_snb, "event=0xcd,umask=0x2"); +@@ -2552,7 +2560,7 @@ __init int intel_pmu_init(void) + + x86_pmu.event_constraints = intel_hsw_event_constraints; + x86_pmu.pebs_constraints = intel_hsw_pebs_event_constraints; +- x86_pmu.extra_regs = intel_snb_extra_regs; ++ x86_pmu.extra_regs = intel_hsw_extra_regs; + x86_pmu.pebs_aliases = intel_pebs_aliases_snb; + /* all extra regs are per-cpu when HT is on */ + x86_pmu.er_flags |= ERF_HAS_RSP_1; +-- +1.9.1 + Files old/numatop/test/mgen/mgen and new/numatop/test/mgen/mgen differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/test/mgen/mgen.c new/numatop/test/mgen/mgen.c --- old/numatop/test/mgen/mgen.c 2014-07-01 02:40:53.000000000 +0200 +++ new/numatop/test/mgen/mgen.c 2015-07-30 03:18:39.000000000 +0200 @@ -203,7 +203,7 @@ calibrate_cpuinfo(double *nsofclk, double *clkofns, uint64_t *clkofsec) { FILE *f; - char *line = NULL, unit[10]; + char *line = NULL, unit[11]; size_t len = 0; double freq = 0.0; Files old/numatop/test/mgen/mgen.o and new/numatop/test/mgen/mgen.o differ

1 0

commit thermald for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '16

31 Mar '16

Hello community, here is the log from the commit of package thermald for openSUSE:Factory checked in at 2016-03-31 13:03:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/thermald (Old) and /work/SRC/openSUSE:Factory/.thermald.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "thermald" Changes: -------- --- /work/SRC/openSUSE:Factory/thermald/thermald.changes 2016-03-26 15:22:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.thermald.new/thermald.changes 2016-03-31 13:03:07.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Mar 29 11:17:35 UTC 2016 - dvaleev(a)suse.com + +- Set exclusivearch to intel architectures + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ thermald.spec ++++++ --- /var/tmp/diff_new_pack.lEeb0t/_old 2016-03-31 13:03:09.000000000 +0200 +++ /var/tmp/diff_new_pack.lEeb0t/_new 2016-03-31 13:03:09.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package thermald # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,9 +38,10 @@ BuildRequires: dbus-1-glib-devel %endif %if %{defined fedora_version} -BuildRequires: systemd-units BuildRequires: dbus-glib-devel +BuildRequires: systemd-units %endif +ExclusiveArch: %{ix86} x86_64 %description Thermald is a Linux daemon used to prevent the overheating of platforms.

1 0