April 2014 - openSUSE Commits - openSUSE Mailing Lists

commit libXcomposite for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package libXcomposite for openSUSE:Factory checked in at 2014-04-26 19:34:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libXcomposite (Old) and /work/SRC/openSUSE:Factory/.libXcomposite.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libXcomposite" Changes: -------- --- /work/SRC/openSUSE:Factory/libXcomposite/libXcomposite.changes 2013-04-14 10:34:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libXcomposite.new/libXcomposite.changes 2014-04-26 19:34:14.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 24 23:21:30 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Add missing BuildRequires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libXcomposite.spec ++++++ --- /var/tmp/diff_new_pack.VBGu3V/_old 2014-04-26 19:34:15.000000000 +0200 +++ /var/tmp/diff_new_pack.VBGu3V/_new 2014-04-26 19:34:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libXcomposite # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,6 +34,7 @@ BuildRequires: pkgconfig BuildRequires: pkgconfig(compositeproto) >= 0.4 BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xextproto) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xorg-macros) >= 1.8 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libxshmfence for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package libxshmfence for openSUSE:Factory checked in at 2014-04-26 19:34:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxshmfence (Old) and /work/SRC/openSUSE:Factory/.libxshmfence.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libxshmfence" Changes: -------- --- /work/SRC/openSUSE:Factory/libxshmfence/libxshmfence.changes 2013-12-11 17:22:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libxshmfence.new/libxshmfence.changes 2014-04-26 19:34:13.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 24 18:25:35 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Add missing BuildRequires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxshmfence.spec ++++++ --- /var/tmp/diff_new_pack.Fpnw9m/_old 2014-04-26 19:34:14.000000000 +0200 +++ /var/tmp/diff_new_pack.Fpnw9m/_new 2014-04-26 19:34:14.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libxshmfence # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,10 +18,9 @@ Name: libxshmfence Version: 1.1 -%define lname libxshmfence1 Release: 0 +%define lname libxshmfence1 Summary: A tiny library that exposes a event API on top of Linux futexes -# Placeholder License, please fill in the real one, but which one? License: HPND Group: Development/Libraries/C and C++ Url: http://xorg.freedesktop.org/ @@ -36,7 +35,7 @@ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(xorg-macros) >= 1.8 - +BuildRequires: pkgconfig(xproto) %description This is a tiny library that exposes a event API on top of Linux @@ -80,7 +79,6 @@ make install DESTDIR="%buildroot" rm -f "%buildroot/%_libdir"/*.la - %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hwinfo for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package hwinfo for openSUSE:Factory checked in at 2014-04-26 19:34:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwinfo (Old) and /work/SRC/openSUSE:Factory/.hwinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hwinfo" Changes: -------- --- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes 2014-03-31 20:43:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hwinfo.new/hwinfo.changes 2014-04-26 19:34:12.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 25 10:17:15 CEST 2014 - snwint(a)suse.de + +- don't dump netcard eeprom by default (bnc #875021) +- 21.4 + +------------------------------------------------------------------- Old: ---- hwinfo-21.3.tar.bz2 New: ---- hwinfo-21.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.mVhv4I/_old 2014-04-26 19:34:12.000000000 +0200 +++ /var/tmp/diff_new_pack.mVhv4I/_new 2014-04-26 19:34:13.000000000 +0200 @@ -36,9 +36,9 @@ Group: Hardware/Other # Until migration to github this should be correct url Url: http://gitorious.org/opensuse/hwinfo -Version: 21.3 +Version: 21.4 Release: 0 -Source: hwinfo-21.3.tar.bz2 +Source: hwinfo-21.4.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ hwinfo-21.3.tar.bz2 -> hwinfo-21.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.3/VERSION new/hwinfo-21.4/VERSION --- old/hwinfo-21.3/VERSION 2014-03-31 11:12:56.000000000 +0200 +++ new/hwinfo-21.4/VERSION 2014-04-25 10:17:11.000000000 +0200 @@ -1 +1 @@ -21.3 +21.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.3/changelog new/hwinfo-21.4/changelog --- old/hwinfo-21.3/changelog 2014-03-31 11:12:57.000000000 +0200 +++ new/hwinfo-21.4/changelog 2014-04-25 10:17:13.000000000 +0200 @@ -1,4 +1,7 @@ -2014-03-31: HEAD +2014-04-24: HEAD + - don't dump netcard eeprom by default (bnc #875021) + +2014-03-31: 21.3 - Merge pull request #3 from openSUSE/bnc853635 - Removed an unnecessary newline from dump_line call. - Removed an unnecessary newline from dump_line call. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.3/src/hd/hd.c new/hwinfo-21.4/src/hd/hd.c --- old/hwinfo-21.3/src/hd/hd.c 2014-03-24 12:24:57.000000000 +0100 +++ new/hwinfo-21.4/src/hd/hd.c 2014-04-24 18:16:51.000000000 +0200 @@ -1835,7 +1835,6 @@ if(hd_probe_feature(hd_data, pr_bios_vram)) hd_data->flags.biosvram = 1; hd_set_probe_feature(hd_data, pr_bios_acpi); hd_set_probe_feature(hd_data, pr_modules_pata); - hd_set_probe_feature(hd_data, pr_net_eeprom); hd_data->flags.pata = hd_probe_feature(hd_data, pr_modules_pata) ? 1 : 0; hd_set_probe_feature(hd_data, pr_x86emu); if(!get_probe_val_list(hd_data, pr_x86emu)) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-04-26 19:34:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2014-04-14 06:43:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-04-26 19:34:04.000000000 +0200 @@ -1,0 +2,314 @@ +Thu Apr 24 23:51:59 CEST 2014 - ms(a)suse.de + +- v5.06.79 released + +------------------------------------------------------------------- +Thu Apr 24 22:35:50 CEST 2014 - ms(a)suse.de + +- Fixed value and handling for profile variable kiwi_allFreeVolume + * If a volume with size="all" is specified and in addition this + volume takes a custom volume name with a custom mountpoint, + the variable was setup with the kiwi default volume naming + schema but not with the real volume name which lead to a + boot problem when kiwi could not find the volume + +------------------------------------------------------------------- +Thu Apr 24 14:00:55 CEST 2014 - ms(a)suse.de + +- v5.06.78 released + +------------------------------------------------------------------- +Thu Apr 24 13:56:07 CEST 2014 - ms(a)suse.de + +- Allow ext4 as boot filesystem + +------------------------------------------------------------------- +Thu Apr 24 11:22:00 CEST 2014 - thardeck(a)suse.de + +- Use existing credentials name for repositories + * Don't add a credentials name to repositories if there is already one + +------------------------------------------------------------------- +Thu Apr 24 09:04:55 CEST 2014 - ms(a)suse.de + +- Fixed pxePartitionInputGeneric + In case of a raid setup via pxeboot the required partition type 'fd' + is not explicitly provided in the PART line of the client config. + Instead the raid information is given in an additional RAID variable. + Thus the pxePartitionInputGeneric function has to set the partition + type 'fd' if the RAID variable is set too. + +------------------------------------------------------------------- +Wed Apr 23 14:59:55 CEST 2014 - ms(a)suse.de + +- Follow up fix for partedGetPartitionID + * return if no partition label could be detected + +------------------------------------------------------------------- +Wed Apr 23 14:41:45 CEST 2014 - ms(a)suse.de + +- Make partedGetPartitionID more robust + * If we can't find a partition label for the disk don't proceed + checking for a partition ID and return an unknown ID 'xx' + +------------------------------------------------------------------- +Wed Apr 23 14:15:27 CEST 2014 - ms(a)suse.de + +- Fixed message displayed in __checkCorrectRootFSPermissons + LSB standard does not prescribe UID and GID values + +------------------------------------------------------------------- +Wed Apr 23 10:22:12 CEST 2014 - ms(a)suse.de + +- Fixed __checkCorrectRootFSPermissons runtime check + * Don't check for root/root permissions in root's home + It's ok to have custom files with custom permissions + there + +------------------------------------------------------------------- +Wed Apr 23 10:17:48 CEST 2014 - ms(a)suse.de + +- Fixed recovery grub2 setup + * don't use fixed class and theme names + +------------------------------------------------------------------- +Wed Apr 23 10:10:07 CEST 2014 - ms(a)suse.de + +- Use suse parted 'type' command extension to setup swap partition + type. This is done because the upstream way of setting swap type + is broken in the suse parted. + +------------------------------------------------------------------- +Tue Apr 22 19:11:02 CEST 2014 - ms(a)suse.de + +- Fixed message displayed when the partition table is created/updated. + Even in the case of creating a new partition table the message said + something about repartition of the disk which is misleading. Thus + the message changed to just tell the user about a partition + process happening now + +------------------------------------------------------------------- +Tue Apr 22 11:02:14 CEST 2014 - ms(a)suse.de + +- v5.06.77 released + +------------------------------------------------------------------- +Tue Apr 22 00:32:42 CEST 2014 - ms(a)suse.de + +- Fixed cache creation in --init-cache mode + +------------------------------------------------------------------- +Sun Apr 20 10:57:41 CEST 2014 - ms(a)suse.de + +- Fixed --bootcd post processing mode + +------------------------------------------------------------------- +Sun Apr 20 10:25:42 CEST 2014 - ms(a)suse.de + +- Fixed --bootusb post processing mode + +------------------------------------------------------------------- +Thu Apr 17 16:01:59 CEST 2014 - ms(a)suse.de + +- v5.06.76 released + +------------------------------------------------------------------- +Thu Apr 17 15:56:46 CEST 2014 - ms(a)suse.de + +- Fixed __hasBootDescription() runtime check for pxe type + The type in the XML is 'pxe' but the boot description is + named 'netboot' + +------------------------------------------------------------------- +Thu Apr 17 12:32:08 CEST 2014 - ms(a)suse.de + +- v5.06.75 released + +------------------------------------------------------------------- +Thu Apr 17 12:10:47 CEST 2014 - ms(a)suse.de + +- Remove suseCloneRunlevel calls from EC2 and Xen guest + templates. They are obsolete since sysVInit has been + replaced with systemd + +------------------------------------------------------------------- +Thu Apr 17 12:06:36 CEST 2014 - ms(a)suse.de + +- Update service support functions + * remove obsolete suseCloneRunlevel and suseActivateServices + * use chkconfig instead of insserv + * enhance suseService to be called with on|off and + sysVInit runlevels like chkconfig supports it. For + systemd this value would be ignored + +------------------------------------------------------------------- +Thu Apr 17 11:38:13 CEST 2014 - ms(a)suse.de + +- Update baseSetRunlevel() function + * support custom systemd target names + +------------------------------------------------------------------- +Thu Apr 17 10:31:03 CEST 2014 - ms(a)suse.de + +- Use linuxefi/initrdefi grub2 commands only for EFI secure boot + +------------------------------------------------------------------- +Wed Apr 16 13:38:19 CEST 2014 - adrian(a)suse.de + +- installed prod file parsing is not important anymore + + disable horrible code for openSUSE 13.2 and SLE 12 :) + +------------------------------------------------------------------- +Wed Apr 16 12:36:16 CEST 2014 - ms(a)suse.de + +- v5.06.74 released + +------------------------------------------------------------------- +Wed Apr 16 12:27:14 CEST 2014 - ms(a)suse.de + +- Fixed legacy boot support for EFI install stick images (git #341) + +------------------------------------------------------------------- +Wed Apr 16 12:12:57 CEST 2014 - ms(a)suse.de + +- Fixed build of install stick in EFI firmware mode (git #341) + +------------------------------------------------------------------- +Wed Apr 16 09:45:04 CEST 2014 - ms(a)suse.de + +- Update media collect code to match coding style and + conventions as well as remove/rewrite comments which + are obviosly wrong with regards to the current code + +------------------------------------------------------------------- +Wed Apr 16 09:03:01 CEST 2014 - adrian(a)suse.de + +- fix parsing of product summary label on new openSUSE 13.2/SLE12 medias + +------------------------------------------------------------------- +Tue Apr 15 16:59:53 CEST 2014 - ms(a)suse.de + +- v5.06.73 released + +------------------------------------------------------------------- +Tue Apr 15 15:54:51 CEST 2014 - adrian(a)suse.de + +- drop .channel files for products, generate .report files instead ++++ 130 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kiwi/kiwi.changes ++++ and /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.85Ip4A/_old 2014-04-26 19:34:06.000000000 +0200 +++ /var/tmp/diff_new_pack.85Ip4A/_new 2014-04-26 19:34:06.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 5.06.71 +Version: 5.06.79 Release: 0 # requirements to build packages BuildRequires: diffutils ++++++ kiwi-docu.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kiwi/kiwi-docu.tar.bz2 /work/SRC/openSUSE:Factory/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ ++++ 4046 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libnfnetlink for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package libnfnetlink for openSUSE:Factory checked in at 2014-04-26 19:34:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libnfnetlink (Old) and /work/SRC/openSUSE:Factory/.libnfnetlink.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libnfnetlink" Changes: -------- --- /work/SRC/openSUSE:Factory/libnfnetlink/libnfnetlink.changes 2012-12-14 09:39:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libnfnetlink.new/libnfnetlink.changes 2014-04-26 19:34:02.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 24 09:54:12 UTC 2014 - dmueller(a)suse.com + +- remove dependency on gpg-offline (blocks rebuilds and + tarball integrity is checked by source-validator anyway) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnfnetlink.spec ++++++ --- /var/tmp/diff_new_pack.zErVHv/_old 2014-04-26 19:34:03.000000000 +0200 +++ /var/tmp/diff_new_pack.zErVHv/_new 2014-04-26 19:34:03.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libnfnetlink # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ Group: Productivity/Networking/Security Url: http://netfilter.org/projects/libnfnetlink/ +#Freecode-URL: http://freecode.com/projects/libnfnetlink/ #Git-Clone: git://git.netfilter.org/libnfnetlink #DL-URL: ftp://ftp.netfilter.org/pub/libnfnetlink/ Source: http://netfilter.org/projects/libnfnetlink/files/%name-%version.tar.bz2 @@ -36,9 +37,6 @@ #BuildRequires: automake >= 1.6 #BuildRequires: libtool BuildRequires: pkgconfig >= 0.21 -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif %description libnfnetlink is the low-level library for netfilter related @@ -83,9 +81,6 @@ libnetfilter_log, libnetfilter_queue or libnetfilter_conntrack. %prep -%if 0%{?gpg_verify:1} -%gpg_verify %{S:2} -%endif %setup -q %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit iptables for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package iptables for openSUSE:Factory checked in at 2014-04-26 19:33:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iptables (Old) and /work/SRC/openSUSE:Factory/.iptables.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "iptables" Changes: -------- --- /work/SRC/openSUSE:Factory/iptables/iptables.changes 2013-11-25 16:02:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.iptables.new/iptables.changes 2014-04-26 19:34:01.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Apr 24 09:54:12 UTC 2014 - dmueller(a)suse.com + +- remove dependency on gpg-offline (blocks rebuilds and + tarball integrity is checked by source-validator anyway) + +------------------------------------------------------------------- +Wed Apr 23 16:20:02 UTC 2014 - dmueller(a)suse.com + +- remove dependency on sgmltool: doesn't seem to be used + and reduces rebuild time on aarch64 by 8 hours + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iptables.spec ++++++ --- /var/tmp/diff_new_pack.OBXmrF/_old 2014-04-26 19:34:02.000000000 +0200 +++ /var/tmp/diff_new_pack.OBXmrF/_new 2014-04-26 19:34:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package iptables # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products 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,6 @@ Patch4: iptables-apply-mktemp-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} -BuildRequires: sgmltool -%endif %if 0%{?fedora_version} || 0%{?centos_version} BuildRequires: sgml-common %endif @@ -50,15 +47,12 @@ %if 0%{?suse_version} BuildRequires: fdupes %endif -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif -%if 0%{?suse_version} >= 1140 +%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} BuildRequires: pkgconfig(libnetfilter_conntrack) >= 1.0.4 BuildRequires: pkgconfig(libnfnetlink) >= 1.0.0 %endif -%if (0%{?suse_version} && 0%{?suse_version} <= 1110) || 0%{?fedora_version} || 0%{?centos_version} || 0%{?redhat_version} -BuildRequires: libnetfilter_conntrack >= 1.0.4 +%if (0%{?suse_version} && 0%{?suse_version} <= 1110) || 0%{?centos_version} || 0%{?redhat_version} +BuildRequires: libnetfilter_conntrack-devel >= 1.0.4 BuildRequires: libnfnetlink-devel >= 1.0.0 %endif Requires: xtables-plugins = %version @@ -143,7 +137,6 @@ xtables --variable=xtlibdir). %prep -%{?gpg_verify: %gpg_verify %{S:2}} %setup -q %patch -P 3 -P 4 -p1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-lxml for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package python-lxml for openSUSE:Factory checked in at 2014-04-26 19:33:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-lxml (Old) and /work/SRC/openSUSE:Factory/.python-lxml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-lxml" Changes: -------- --- /work/SRC/openSUSE:Factory/python-lxml/python-lxml.changes 2014-03-11 09:23:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-lxml.new/python-lxml.changes 2014-04-26 19:33:59.000000000 +0200 @@ -1,0 +2,26 @@ +Thu Apr 24 06:48:15 UTC 2014 - toms(a)opensuse.org + +- Spec file changes: + Added BuildRequires for python-cssselect + +- Update to version 3.3.5: + ** Features added + n/a + ** Bugs fixed + - HTML cleaning could fail to strip javascript links that mix + control characters into the link scheme. + ** Other changes + n/a + +- Changes in version 3.3.4: + ** Features added + - Source line numbers above 65535 are available on Elements when + using libxml2 2.9 or later. + ** Bugs fixed + - lxml.html.fragment_fromstring() failed for bytes input in Py3. + ** Other changes + n/a + +See also http://lxml.de/3.3/changes-3.3.5.html + +------------------------------------------------------------------- Old: ---- lxml-3.3.3.tgz lxmldoc-3.3.3.pdf New: ---- lxml-3.3.5.tgz lxmldoc-3.3.5.pdf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-lxml.spec ++++++ --- /var/tmp/diff_new_pack.OPYqNU/_old 2014-04-26 19:33:59.000000000 +0200 +++ /var/tmp/diff_new_pack.OPYqNU/_new 2014-04-26 19:33:59.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-lxml -Version: 3.3.3 +Version: 3.3.5 Release: 0 Summary: Powerful and Pythonic XML processing library License: BSD-3-Clause and GPL-2.0+ @@ -30,6 +30,8 @@ BuildRequires: python-Cython >= 0.20 BuildRequires: python-devel BuildRequires: python-setuptools +# Needed for test cases: +BuildRequires: python-cssselect Requires: python-cssselect BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 ++++++ lxml-3.3.3.tgz -> lxml-3.3.5.tgz ++++++ ++++ 28721 lines of diff (skipped) ++++++ lxmldoc-3.3.3.pdf -> lxmldoc-3.3.5.pdf ++++++ (binary differes) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openssh for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package openssh for openSUSE:Factory checked in at 2014-04-26 17:02:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openssh (Old) and /work/SRC/openSUSE:Factory/.openssh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openssh" Changes: -------- --- /work/SRC/openSUSE:Factory/openssh/openssh.changes 2014-04-17 14:43:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openssh.new/openssh.changes 2014-04-26 17:02:04.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 24 01:33:45 UTC 2014 - pcerny(a)suse.com + +- curve25519 key exchange fix (-curve25519-6.6.1p1.patch) +- patch re-ordering (-audit3-key_auth_usage-fips.patch, + -audit4-kex_results-fips.patch) + +------------------------------------------------------------------- Old: ---- openssh-6.6p1-audit3_fips-key_auth_usage.patch openssh-6.6p1-audit4_fips-kex_results.patch New: ---- openssh-6.6p1-audit3-key_auth_usage-fips.patch openssh-6.6p1-audit4-kex_results-fips.patch openssh-6.6p1-curve25519-6.6.1p1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssh.spec ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -108,6 +108,7 @@ Source8: sysconfig.ssh Source9: sshd-gen-keys-start Source10: sshd.service +Patch0: openssh-6.6p1-curve25519-6.6.1p1.patch Patch1: openssh-6.6p1-key-converter.patch Patch2: openssh-6.6p1-X11-forwarding.patch Patch3: openssh-6.6p1-lastlog.patch @@ -128,9 +129,9 @@ Patch18: openssh-6.6p1-audit1-remove_duplicit_audit.patch Patch19: openssh-6.6p1-audit2-better_audit_of_user_actions.patch Patch20: openssh-6.6p1-audit3-key_auth_usage.patch -Patch21: openssh-6.6p1-audit3_fips-key_auth_usage.patch +Patch21: openssh-6.6p1-audit3-key_auth_usage-fips.patch Patch22: openssh-6.6p1-audit4-kex_results.patch -Patch23: openssh-6.6p1-audit4_fips-kex_results.patch +Patch23: openssh-6.6p1-audit4-kex_results-fips.patch Patch24: openssh-6.6p1-audit5-session_key_destruction.patch Patch25: openssh-6.6p1-audit6-server_key_destruction.patch Patch26: openssh-6.6p1-audit7-libaudit_compat.patch @@ -180,6 +181,7 @@ %prep %setup -q +%patch0 -p2 #patch1 -p2 %patch2 -p2 %patch3 -p2 ++++++ openssh-6.6p1-X_forward_with_disabled_ipv6.patch ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 73eb63cbbd603bf8c13995c478333c1b5a2a020a +# Parent 1055b218140c3cc19228c47878a68740363d80dd Do not throw away already open sockets for X11 forwarding if another socket family is not available for bind() ++++++ openssh-6.6p1-audit2-better_audit_of_user_actions.patch ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -849,7 +849,7 @@ diff --git a/openssh-6.6p1/sshd.c b/openssh-6.6p1/sshd.c --- a/openssh-6.6p1/sshd.c +++ b/openssh-6.6p1/sshd.c -@@ -2529,13 +2529,14 @@ cleanup_exit(int i) +@@ -2532,13 +2532,14 @@ cleanup_exit(int i) if (kill(pmonitor->m_pid, SIGKILL) != 0 && errno != ESRCH) error("%s: kill(%d): %s", __func__, ++++++ openssh-6.6p1-audit3-key_auth_usage-fips.patch ++++++ # HG changeset patch # Parent 5482d21e8bd06309af51dea77a5f3668859fb2a0 diff --git a/openssh-6.6p1/auth-rsa.c b/openssh-6.6p1/auth-rsa.c --- a/openssh-6.6p1/auth-rsa.c +++ b/openssh-6.6p1/auth-rsa.c @@ -94,16 +94,20 @@ int auth_rsa_verify_response(Key *key, BIGNUM *challenge, u_char response[SSH_DIGEST_MAX_LENGTH]) { u_char buf[2 * SSH_DIGEST_MAX_LENGTH], mdbuf[SSH_DIGEST_MAX_LENGTH]; struct ssh_digest_ctx *md; int len; int dgst; size_t dgst_len; + int rv; +#ifdef SSH_AUDIT_EVENTS + char *fp; +#endif /* don't allow short keys */ if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) { error("%s: RSA modulus too small: %d < minimum %d bits", __func__, BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE); return (0); } @@ -121,22 +125,28 @@ auth_rsa_verify_response(Key *key, BIGNU if ((md = ssh_digest_start(dgst)) == NULL || ssh_digest_update(md, buf, 2 * dgst_len) < 0 || ssh_digest_update(md, session_id, dgst_len) < 0 || ssh_digest_final(md, mdbuf, sizeof(mdbuf)) < 0) fatal("%s: md5 failed", __func__); ssh_digest_free(md); /* Verify that the response is the original challenge. */ - if (timingsafe_bcmp(response, mdbuf, dgst_len) != 0) { - /* Wrong answer. */ - return (0); + rv = timingsafe_bcmp(response, mdbuf, dgst_len) == 0; + +#ifdef SSH_AUDIT_EVENTS + fp = key_fingerprint(key, key_fp_type_select(), SSH_FP_HEX); + if (audit_keyusage(1, "ssh-rsa1", RSA_size(key->rsa) * 8, fp, rv) == 0) { + debug("unsuccessful audit"); + rv = 0; } - /* Correct answer. */ - return (1); + free(fp); +#endif + + return rv; } /* * Performs the RSA authentication challenge-response dialog with the client, * and returns true (non-zero) if the client gave the correct answer to * our challenge; returns zero if the client gives a wrong answer. */ ++++++ openssh-6.6p1-audit4-kex_results-fips.patch ++++++ # HG changeset patch # Parent 274a545b591567f1378c1086ad3ba40c911a8bd6 diff --git a/openssh-6.6p1/Makefile.in b/openssh-6.6p1/Makefile.in --- a/openssh-6.6p1/Makefile.in +++ b/openssh-6.6p1/Makefile.in @@ -72,17 +72,18 @@ LIBSSH_OBJS=authfd.o authfile.o bufaux.o atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \ msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ ssh-pkcs11.o krl.o smult_curve25519_ref.o \ kexc25519.o kexc25519c.o poly1305.o chacha.o cipher-chachapoly.o \ ssh-ed25519.o digest-openssl.o hmac.o \ sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o \ - fips.o + fips.o \ + auditstub.o SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ sshconnect.o sshconnect1.o sshconnect2.o mux.o \ roaming_common.o roaming_client.o SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ audit.o audit-bsm.o audit-linux.o platform.o \ sshpty.o sshlogin.o servconf.o serverloop.o \ diff --git a/openssh-6.6p1/cipher.c b/openssh-6.6p1/cipher.c --- a/openssh-6.6p1/cipher.c +++ b/openssh-6.6p1/cipher.c @@ -54,30 +54,16 @@ /* compatibility with old or broken OpenSSL versions */ #include "openbsd-compat/openssl-compat.h" extern const EVP_CIPHER *evp_ssh1_bf(void); extern const EVP_CIPHER *evp_ssh1_3des(void); extern void ssh1_3des_iv(EVP_CIPHER_CTX *, int, u_char *, int); -struct Cipher { - char *name; - int number; /* for ssh1 only */ - u_int block_size; - u_int key_len; - u_int iv_len; /* defaults to block_size */ - u_int auth_len; - u_int discard_len; - u_int flags; -#define CFLAG_CBC (1<<0) -#define CFLAG_CHACHAPOLY (1<<1) - const EVP_CIPHER *(*evptype)(void); -}; - static const struct Cipher ciphers_all[] = { { "none", SSH_CIPHER_NONE, 8, 0, 0, 0, 0, 0, EVP_enc_null }, { "des", SSH_CIPHER_DES, 8, 8, 0, 0, 0, 1, EVP_des_cbc }, { "3des", SSH_CIPHER_3DES, 8, 16, 0, 0, 0, 1, evp_ssh1_3des }, { "blowfish", SSH_CIPHER_BLOWFISH, 8, 32, 0, 0, 0, 1, evp_ssh1_bf }, { "3des-cbc", SSH_CIPHER_SSH2, 8, 24, 0, 0, 0, 1, EVP_des_ede3_cbc }, { "blowfish-cbc", diff --git a/openssh-6.6p1/sshd.c b/openssh-6.6p1/sshd.c --- a/openssh-6.6p1/sshd.c +++ b/openssh-6.6p1/sshd.c @@ -119,16 +119,18 @@ #endif #include "monitor_wrap.h" #include "roaming.h" #include "ssh-sandbox.h" #include "version.h" #include "fips.h" +#include "audit.h" + #ifdef LIBWRAP #include <tcpd.h> #include <syslog.h> int allow_severity; int deny_severity; #endif /* LIBWRAP */ #ifndef O_NOCTTY ++++++ openssh-6.6p1-audit5-session_key_destruction.patch ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -942,7 +942,7 @@ verbose("Closing connection to %.500s port %d", remote_ip, remote_port); #ifdef USE_PAM -@@ -2523,26 +2532,38 @@ do_ssh2_kex(void) +@@ -2526,26 +2535,38 @@ do_ssh2_kex(void) #endif debug("KEX done"); } ++++++ openssh-6.6p1-audit6-server_key_destruction.patch ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -721,7 +721,7 @@ BN_clear_free(session_key_int); /* Set the session key. From this on all communications will be encrypted. */ -@@ -2553,16 +2603,18 @@ cleanup_exit(int i) +@@ -2556,16 +2606,18 @@ cleanup_exit(int i) debug("Killing privsep child %d", pmonitor->m_pid); if (kill(pmonitor->m_pid, SIGKILL) != 0 && errno != ESRCH) ++++++ openssh-6.6p1-curve25519-6.6.1p1.patch ++++++ # Date: Sun, 20 Apr 2014 17:14:08 +1000 (EST) # From: Damien Miller <djm(a)mindrot.org> # To: openssh-unix-dev(a)mindrot.org # Subject: bad bignum encoding for curve25519-sha256(a)libssh.org # Message-ID: <alpine.BSO.2.11.1404201713390.26134(a)natsu.mindrot.org> # # Hi, # # So I screwed up when writing the support for the curve25519 KEX method # that doesn't depend on OpenSSL's BIGNUM type - a bug in my code left # leading zero bytes where they should have been skipped. The impact of # this is that OpenSSH 6.5 and 6.6 will fail during key exchange with a # peer that implements curve25519-sha256(a)libssh.org properly about 0.2% # of the time (one in every 512ish connections). # # We've fixed this for OpenSSH 6.7 by avoiding the curve25519-sha256 # key exchange for previous versions, but I'd recommend distributors # of OpenSSH apply this patch so the affected code doesn't become # too entrenched in LTS releases. # # The patch fixes the bug and makes OpenSSH identify itself as 6.6.1 so as # to distinguish itself from the incorrect versions so the compatibility # code to disable the affected KEX isn't activated. # # I've committed this on the 6.6 branch too. # # Apologies for the hassle. # # -d diff --git a/openssh-6.6p1/bufaux.c b/openssh-6.6p1/bufaux.c --- a/openssh-6.6p1/bufaux.c +++ b/openssh-6.6p1/bufaux.c @@ -1,9 +1,9 @@ -/* $OpenBSD: bufaux.c,v 1.56 2014/02/02 03:44:31 djm Exp $ */ +/* $OpenBSD: bufaux.c,v 1.57 2014/04/16 23:22:45 djm Exp $ */ /* * Author: Tatu Ylonen <ylo(a)cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo(a)cs.hut.fi>, Espoo, Finland * All rights reserved * Auxiliary functions for storing and retrieving various data types to/from * Buffers. * * As far as I am concerned, the code I have written for this software @@ -367,16 +367,19 @@ buffer_get_bignum2_as_string(Buffer *buf void buffer_put_bignum2_from_string(Buffer *buffer, const u_char *s, u_int l) { u_char *buf, *p; int pad = 0; if (l > 8 * 1024) fatal("%s: length %u too long", __func__, l); + /* Skip leading zero bytes */ + for (; l > 0 && *s == 0; l--, s++) + ; p = buf = xmalloc(l + 1); /* * If most significant bit is set then prepend a zero byte to * avoid interpretation as a negative number. */ if (l > 0 && (s[0] & 0x80) != 0) { *p++ = '\0'; pad = 1; diff --git a/openssh-6.6p1/compat.c b/openssh-6.6p1/compat.c --- a/openssh-6.6p1/compat.c +++ b/openssh-6.6p1/compat.c @@ -90,16 +90,19 @@ compat_datafellows(const char *version) SSH_OLD_FORWARD_ADDR}, { "OpenSSH_2.*," "OpenSSH_3.0*," "OpenSSH_3.1*", SSH_BUG_EXTEOF|SSH_OLD_FORWARD_ADDR}, { "OpenSSH_3.*", SSH_OLD_FORWARD_ADDR }, { "Sun_SSH_1.0*", SSH_BUG_NOREKEY|SSH_BUG_EXTEOF}, { "OpenSSH_4*", 0 }, { "OpenSSH_5*", SSH_NEW_OPENSSH|SSH_BUG_DYNAMIC_RPORT}, + { "OpenSSH_6.6.1*", SSH_NEW_OPENSSH}, + { "OpenSSH_6.5*," + "OpenSSH_6.6*", SSH_NEW_OPENSSH|SSH_BUG_CURVE25519PAD}, { "OpenSSH*", SSH_NEW_OPENSSH }, { "*MindTerm*", 0 }, { "2.1.0*", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| SSH_OLD_SESSIONID|SSH_BUG_DEBUG| SSH_BUG_RSASIGMD5|SSH_BUG_HBSERVICE| SSH_BUG_FIRSTKEX }, { "2.1 *", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| SSH_OLD_SESSIONID|SSH_BUG_DEBUG| @@ -246,22 +249,34 @@ compat_cipher_proposal(char *cipher_prop debug2("%s: original cipher proposal: %s", __func__, cipher_prop); cipher_prop = filter_proposal(cipher_prop, "aes*"); debug2("%s: compat cipher proposal: %s", __func__, cipher_prop); if (*cipher_prop == '\0') fatal("No supported ciphers found"); return cipher_prop; } - char * compat_pkalg_proposal(char *pkalg_prop) { if (!(datafellows & SSH_BUG_RSASIGMD5)) return pkalg_prop; debug2("%s: original public key proposal: %s", __func__, pkalg_prop); pkalg_prop = filter_proposal(pkalg_prop, "ssh-rsa"); debug2("%s: compat public key proposal: %s", __func__, pkalg_prop); if (*pkalg_prop == '\0') fatal("No supported PK algorithms found"); return pkalg_prop; } +char * +compat_kex_proposal(char *kex_prop) +{ + if (!(datafellows & SSH_BUG_CURVE25519PAD)) + return kex_prop; + debug2("%s: original KEX proposal: %s", __func__, kex_prop); + kex_prop = filter_proposal(kex_prop, "curve25519-sha256(a)libssh.org"); + debug2("%s: compat KEX proposal: %s", __func__, kex_prop); + if (*kex_prop == '\0') + fatal("No supported key exchange algorithms found"); + return kex_prop; +} + diff --git a/openssh-6.6p1/compat.h b/openssh-6.6p1/compat.h --- a/openssh-6.6p1/compat.h +++ b/openssh-6.6p1/compat.h @@ -54,20 +54,22 @@ #define SSH_BUG_DUMMYCHAN 0x00100000 #define SSH_BUG_EXTEOF 0x00200000 #define SSH_BUG_PROBE 0x00400000 #define SSH_BUG_FIRSTKEX 0x00800000 #define SSH_OLD_FORWARD_ADDR 0x01000000 #define SSH_BUG_RFWD_ADDR 0x02000000 #define SSH_NEW_OPENSSH 0x04000000 #define SSH_BUG_DYNAMIC_RPORT 0x08000000 +#define SSH_BUG_CURVE25519PAD 0x10000000 void enable_compat13(void); void enable_compat20(void); void compat_datafellows(const char *); int proto_spec(const char *); char *compat_cipher_proposal(char *); char *compat_pkalg_proposal(char *); +char *compat_kex_proposal(char *); extern int compat13; extern int compat20; extern int datafellows; #endif diff --git a/openssh-6.6p1/sshconnect2.c b/openssh-6.6p1/sshconnect2.c --- a/openssh-6.6p1/sshconnect2.c +++ b/openssh-6.6p1/sshconnect2.c @@ -190,16 +190,18 @@ ssh_kex2(char *host, struct sockaddr *ho else { /* Prefer algorithms that we already have keys for */ myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal( order_hostkeyalgs(host, hostaddr, port)); } if (options.kex_algorithms != NULL) myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; + myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal( + myproposal[PROPOSAL_KEX_ALGS]); if (options.rekey_limit || options.rekey_interval) packet_set_rekey_limits((u_int32_t)options.rekey_limit, (time_t)options.rekey_interval); /* start key exchange */ kex = kex_setup(myproposal); kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; diff --git a/openssh-6.6p1/sshd.c b/openssh-6.6p1/sshd.c --- a/openssh-6.6p1/sshd.c +++ b/openssh-6.6p1/sshd.c @@ -2457,16 +2457,19 @@ do_ssh2_kex(void) myproposal[PROPOSAL_COMP_ALGS_STOC] = "none"; } else if (options.compression == COMP_DELAYED) { myproposal[PROPOSAL_COMP_ALGS_CTOS] = myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib(a)openssh.com"; } if (options.kex_algorithms != NULL) myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; + myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal( + myproposal[PROPOSAL_KEX_ALGS]); + if (options.rekey_limit || options.rekey_interval) packet_set_rekey_limits((u_int32_t)options.rekey_limit, (time_t)options.rekey_interval); myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal( list_hostkey_types()); /* start key exchange */ diff --git a/openssh-6.6p1/version.h b/openssh-6.6p1/version.h --- a/openssh-6.6p1/version.h +++ b/openssh-6.6p1/version.h @@ -1,6 +1,6 @@ /* $OpenBSD: version.h,v 1.70 2014/02/27 22:57:40 djm Exp $ */ -#define SSH_VERSION "OpenSSH_6.6" +#define SSH_VERSION "OpenSSH_6.6.1" #define SSH_PORTABLE "p1" #define SSH_RELEASE SSH_VERSION SSH_PORTABLE ++++++ openssh-6.6p1-fingerprint_hash.patch ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent a3a898b117b0f726e6cc923f18463de8e45e74f5 +# Parent 8b2615db484b7061edd15f3bee36958f790f790e # select fingerprint hash algorithms based on the environment variable # SSH_FP_TYPE_ENVVAR and append it to hex and randomart fingerprints @@ -690,7 +690,7 @@ diff --git a/openssh-6.6p1/sshconnect2.c b/openssh-6.6p1/sshconnect2.c --- a/openssh-6.6p1/sshconnect2.c +++ b/openssh-6.6p1/sshconnect2.c -@@ -577,17 +577,17 @@ input_userauth_pk_ok(int type, u_int32_t +@@ -579,17 +579,17 @@ input_userauth_pk_ok(int type, u_int32_t goto done; } if (key->type != pktype) { @@ -709,7 +709,7 @@ * moved to the end of the queue. this also avoids confusion by * duplicate keys */ -@@ -988,17 +988,17 @@ sign_and_send_pubkey(Authctxt *authctxt, +@@ -990,17 +990,17 @@ sign_and_send_pubkey(Authctxt *authctxt, Buffer b; u_char *blob, *signature; u_int bloblen, slen; ++++++ openssh-6.6p1-fips-checks.patch ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -1,5 +1,17 @@ # HG changeset patch -# Parent 12ad7b6077ef9c6b3a3a53b4f0084c3eb2f80fe7 +# Parent 717873621cf4991164c61caafd9ac07473231f10 +# Simple implementation of FIPS 140-2 selfchecks. Use OpenSSL to generate and +# verify checksums of binaries. Any hash iused in OpenSSH can be used (MD5 would +# obviously be a poor choice, since OpenSSL would barf and abort immediately in +# FIPS mode). SHA-2 seems to be a reasonable choice. +# +# The logic of the checks is as follows: decide whether FIPS mode is mandated +# (either by checking /proc/sys/crypto/fips_enabled or envoroinment variable +# SSH_FORCE_FIPS. In FIPS mode, checksums are required to match (inability to +# retrieve pre-calculated hash is a fatal error). In non-FIPS mode the checks +# still must be performed, unless the hashes are not installed. Thus if the hash +# file is not found (or the hash matches), proceed in non-FIPS mode and abort +# otherwise. diff --git a/openssh-6.6p1/fips-check.c b/openssh-6.6p1/fips-check.c new file mode 100644 ++++++ openssh-6.6p1-fips.patch ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -2,7 +2,7 @@ # when OpenSSL is detected to be running in FIPS mode # # HG changeset patch -# Parent ff04a9a96b7c41e99445c68d91911a9a1474ffa2 +# Parent 844066cb9c0ec2b10eb1ace7134f7bced7cc802d diff --git a/openssh-6.6p1/Makefile.in b/openssh-6.6p1/Makefile.in --- a/openssh-6.6p1/Makefile.in @@ -66,7 +66,7 @@ + u_char buf[2 * SSH_DIGEST_MAX_LENGTH], mdbuf[SSH_DIGEST_MAX_LENGTH]; struct ssh_digest_ctx *md; int len; -+ int dgst; ++ int dgst; + size_t dgst_len; /* don't allow short keys */ @@ -78,7 +78,7 @@ } - /* The response is MD5 of decrypted challenge plus session id. */ -+ dgst = fips_correct_dgst(SSH_DIGEST_MD5); ++ dgst = fips_correct_dgst(SSH_DIGEST_MD5); + dgst_len = ssh_digest_bytes(dgst); + + /* The response is a hash of decrypted challenge plus session id. ++++++ openssh-6.6p1-gssapi_key_exchange.patch ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent b50b01e06558d268ae59e8be8c1a41fde44fc70d +# Parent 0b2761bdc8c2071a11ca24387c3f58be2fdbaa5e diff --git a/openssh-6.6p1/ChangeLog.gssapi b/openssh-6.6p1/ChangeLog.gssapi new file mode 100644 @@ -3239,14 +3239,14 @@ myproposal[PROPOSAL_ENC_ALGS_CTOS] = myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; } else if (fips_mode()) { -@@ -203,32 +228,63 @@ ssh_kex2(char *host, struct sockaddr *ho - /* Prefer algorithms that we already have keys for */ - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = +@@ -205,32 +230,63 @@ ssh_kex2(char *host, struct sockaddr *ho compat_pkalg_proposal( order_hostkeyalgs(host, hostaddr, port)); } if (options.kex_algorithms != NULL) myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; + myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal( + myproposal[PROPOSAL_KEX_ALGS]); +#ifdef GSSAPI + /* If we've got GSSAPI algorithms, then we also support the @@ -3291,7 +3291,7 @@ + kex->gss_host = options.gss_server_identity; + } else { + kex->gss_host = gss_host; -+ } ++ } + } +#endif + @@ -3303,7 +3303,7 @@ debug("Roaming not allowed by server"); options.use_roaming = 0; } -@@ -308,31 +364,37 @@ int userauth_hostbased(Authctxt *); +@@ -310,31 +366,37 @@ int userauth_hostbased(Authctxt *); #ifdef GSSAPI int userauth_gssapi(Authctxt *authctxt); @@ -3341,7 +3341,7 @@ {"gssapi", userauth_gssapi, NULL, -@@ -624,29 +686,41 @@ done: +@@ -626,29 +688,41 @@ done: int userauth_gssapi(Authctxt *authctxt) { @@ -3385,7 +3385,7 @@ if (!ok) return 0; -@@ -735,18 +809,18 @@ process_gssapi_token(void *ctxt, gss_buf +@@ -737,18 +811,18 @@ process_gssapi_token(void *ctxt, gss_buf } /* ARGSUSED */ @@ -3406,7 +3406,7 @@ /* Setup our OID */ oidv = packet_get_string(&oidlen); -@@ -845,16 +919,58 @@ input_gssapi_error(int type, u_int32_t p +@@ -847,16 +921,58 @@ input_gssapi_error(int type, u_int32_t p lang=packet_get_string(NULL); packet_check_eom(); @@ -3655,7 +3655,7 @@ * mode; it is just annoying to have the server exit just when you * are about to discover the bug. */ -@@ -2559,24 +2674,73 @@ do_ssh2_kex(void) +@@ -2562,24 +2677,73 @@ do_ssh2_kex(void) if (options.rekey_limit || options.rekey_interval) packet_set_rekey_limits((u_int32_t)options.rekey_limit, ++++++ openssh-6.6p1-gssapimitm.patch ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -356,7 +356,7 @@ diff --git a/openssh-6.6p1/sshconnect2.c b/openssh-6.6p1/sshconnect2.c --- a/openssh-6.6p1/sshconnect2.c +++ b/openssh-6.6p1/sshconnect2.c -@@ -316,16 +316,21 @@ static char *authmethods_get(void); +@@ -318,16 +318,21 @@ static char *authmethods_get(void); Authmethod authmethods[] = { #ifdef GSSAPI @@ -378,7 +378,7 @@ NULL}, {"publickey", userauth_pubkey, -@@ -683,17 +688,19 @@ process_gssapi_token(void *ctxt, gss_buf +@@ -685,17 +690,19 @@ process_gssapi_token(void *ctxt, gss_buf packet_put_string(send_tok.value, send_tok.length); packet_send(); ++++++ openssh-6.6p1-seccomp_getuid.patch ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 47040f4641d43b039f19c8c902b0259729bb88e2 +# Parent bde6f1a808f345e141a976ebc3e37903c81a09cb add 'getuid' syscall to list of allowed ones to prevent the sanboxed thread from being killed by the seccomp filter -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cmake for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2014-04-26 17:02:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake (Old) and /work/SRC/openSUSE:Factory/.cmake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cmake" Changes: -------- --- /work/SRC/openSUSE:Factory/cmake/cmake-gui.changes 2014-03-23 22:29:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2014-04-26 17:02:01.000000000 +0200 @@ -1,0 +2,36 @@ +Thu Apr 24 23:08:48 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 3.0.0~rc4 + * Revise and format policy CMP0025 and CMP0047 docs + * Do not warn by default when policy CMP0025 or CMP0047 is not set + * CMakeDetermineVSServicePack: Format documentation + * CMakeDetermineVSServicePack: Match versions more robustly + * CMakeDetermineVSServicePack: Add VS 11 update 4 + * Fortran: Detect pointer size on Intel archs with PGI (#14870) + * CMakeRCInformation: Do not mention 'Fortran' in documentation + * CMakeRCInformation: Recognize 'windres' tools with '.' in name (#14865) + * Drop /lib32 and /lib64 from link directories and RPATH (#14875) + * cmArchiveWrite: Handle NULL error string (#14882) + * Policies: omit warnings about unset policies when they are + actually set to NEW + * Qt4Macros: Make QT4_CREATE_MOC_COMMAND a function + * create_test_sourcelist: Initialize variable at declaration + * Help: Fix typo in cmake-qt manual. + +------------------------------------------------------------------- +Wed Apr 23 17:15:17 UTC 2014 - dmueller(a)suse.com + +- fix build on SLE11 +- remove dependency on system curl: this is not a security + senstive app and the system curl comes quite late in the + build cycle +- remove nonsensical checks for %{sles_version} + +------------------------------------------------------------------- +Wed Mar 26 17:33:28 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 3.0.0~rc3 + * QtDialog: Fix Qt 5 build on non-Windows + * Disallow INTERFACE libraries with add_custom_command(TARGET) + +------------------------------------------------------------------- cmake.changes: same change Old: ---- cmake-3.0.0-rc2.tar.gz New: ---- cmake-3.0.0-rc4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake-gui.spec ++++++ --- /var/tmp/diff_new_pack.ZqqdBU/_old 2014-04-26 17:02:02.000000000 +0200 +++ /var/tmp/diff_new_pack.ZqqdBU/_new 2014-04-26 17:02:02.000000000 +0200 @@ -17,9 +17,9 @@ Name: cmake-gui -Version: 3.0.0~rc2 +Version: 3.0.0~rc4 Release: 0 -%define rversion 3.0.0-rc2 +%define rversion 3.0.0-rc4 Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v3.0/cmake-%{rversion}.tar.gz Summary: CMake graphical user interface ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.ZqqdBU/_old 2014-04-26 17:02:02.000000000 +0200 +++ /var/tmp/diff_new_pack.ZqqdBU/_new 2014-04-26 17:02:02.000000000 +0200 @@ -17,9 +17,9 @@ Name: cmake -Version: 3.0.0~rc2 +Version: 3.0.0~rc4 Release: 0 -%define rversion 3.0.0-rc2 +%define rversion 3.0.0-rc4 Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v3.0/%{name}-%{rversion}.tar.gz Source1: cmake.macros @@ -33,19 +33,15 @@ %if 0%{?suse_version} > 1010 BuildRequires: fdupes %endif -%if 0%{?sles_version} != 10 +%if 0%{?suse_version} > 1110 BuildRequires: libarchive-devel +BuildRequires: libbz2-devel %endif BuildRequires: libexpat-devel -%else -BuildRequires: expat-devel %endif -BuildRequires: curl-devel BuildRequires: gcc-c++ BuildRequires: ncurses-devel -BuildRequires: openssl-devel BuildRequires: zlib-devel -BuildRequires: pkgconfig(bzip2) Requires: make @@ -64,16 +60,13 @@ --datadir=/share/%{name} \ --docdir=/share/doc/packages/%{name} \ --mandir=/share/man \ -%if 0%{?suse_version} && !0%{?sles_version} --system-libs \ -%else - --system-curl \ - --system-expat \ - --system-zlib \ - --system-bzip2 \ + --no-system-curl \ +%if 0%{?suse_version} <= 1110 --no-system-libarchive \ %endif --parallel=0%jobs \ + --verbose \ --no-qt-gui make VERBOSE=1 %{?_smp_mflags} @@ -102,6 +95,7 @@ %{_bindir}/ccmake %{_datadir}/cmake %{_libdir}/cmake +%dir %{_datadir}/aclocal %{_datadir}/aclocal/cmake.m4 %doc %{_datadir}/doc/packages/%{name} ++++++ cmake-3.0.0-rc2.tar.gz -> cmake-3.0.0-rc4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Help/manual/cmake-qt.7.rst new/cmake-3.0.0-rc4/Help/manual/cmake-qt.7.rst --- old/cmake-3.0.0-rc2/Help/manual/cmake-qt.7.rst 2014-03-17 19:18:28.000000000 +0100 +++ new/cmake-3.0.0-rc4/Help/manual/cmake-qt.7.rst 2014-04-16 19:54:40.000000000 +0200 @@ -173,7 +173,7 @@ that the qtmain.lib static library shipped with Qt will be linked by all dependent executables which have the :prop_tgt:`WIN32_EXECUTABLE` enabled. -Do disable this behavior, enable the ``Qt5_NO_LINK_QTMAIN`` target property for +To disable this behavior, enable the ``Qt5_NO_LINK_QTMAIN`` target property for Qt 5 based targets or ``QT4_NO_LINK_QTMAIN`` target property for Qt 4 based targets. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Help/manual/cmake-variables.7.rst new/cmake-3.0.0-rc4/Help/manual/cmake-variables.7.rst --- old/cmake-3.0.0-rc2/Help/manual/cmake-variables.7.rst 2014-03-17 19:18:28.000000000 +0100 +++ new/cmake-3.0.0-rc4/Help/manual/cmake-variables.7.rst 2014-04-16 19:54:40.000000000 +0200 @@ -131,6 +131,7 @@ /variable/CMAKE_MODULE_PATH /variable/CMAKE_NOT_USING_CONFIG_FLAGS /variable/CMAKE_POLICY_DEFAULT_CMPNNNN + /variable/CMAKE_POLICY_WARNING_CMPNNNN /variable/CMAKE_PREFIX_PATH /variable/CMAKE_PROGRAM_PATH /variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Help/policy/CMP0025.rst new/cmake-3.0.0-rc4/Help/policy/CMP0025.rst --- old/cmake-3.0.0-rc2/Help/policy/CMP0025.rst 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Help/policy/CMP0025.rst 2014-04-16 19:54:40.000000000 +0200 @@ -1,21 +1,27 @@ CMP0025 ------- -Compiler id for Apple Clang is now AppleClang. +Compiler id for Apple Clang is now ``AppleClang``. -CMake >= 3.0 recognize that Apple Clang is a different compiler +CMake 3.0 and above recognize that Apple Clang is a different compiler than upstream Clang and that they have different version numbers. -CMake now prefers to present this to projects by setting -CMAKE_<LANG>_COMPILER_ID to "AppleClang" instead of "Clang". However, -existing projects may assume the compiler id for Apple Clang is just -"Clang" as it was in CMake < 3.0. Therefore this policy determines -for Apple Clang which compiler id to report in -CMAKE_<LANG>_COMPILER_ID after <LANG> is enabled by the project() or -enable_language() command. +CMake now prefers to present this to projects by setting the +:variable:`CMAKE_<LANG>_COMPILER_ID` variable to ``AppleClang`` instead +of ``Clang``. However, existing projects may assume the compiler id for +Apple Clang is just ``Clang`` as it was in CMake versions prior to 3.0. +Therefore this policy determines for Apple Clang which compiler id to +report in the :variable:`CMAKE_<LANG>_COMPILER_ID` variable after +language ``<LANG>`` is enabled by the :command:`project` or +:command:`enable_language` command. The policy must be set prior +to the invocation of either command. -The OLD behavior for this policy is to use compiler id "Clang". The -NEW behavior for this policy is to use compiler id "AppleClang". +The OLD behavior for this policy is to use compiler id ``Clang``. The +NEW behavior for this policy is to use compiler id ``AppleClang``. -This policy was introduced in CMake version 3.0. CMake version -|release| warns when the policy is not set and uses OLD behavior. Use -the cmake_policy command to set it to OLD or NEW explicitly. +This policy was introduced in CMake version 3.0. Use the +:command:`cmake_policy` command to set this policy to OLD or NEW explicitly. +Unlike most policies, CMake version |release| does *not* warn +by default when this policy is not set and simply uses OLD behavior. +See documentation of the +:variable:`CMAKE_POLICY_WARNING_CMP0025 <CMAKE_POLICY_WARNING_CMP<NNNN>>` +variable to control the warning. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Help/policy/CMP0047.rst new/cmake-3.0.0-rc4/Help/policy/CMP0047.rst --- old/cmake-3.0.0-rc2/Help/policy/CMP0047.rst 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Help/policy/CMP0047.rst 2014-04-16 19:54:40.000000000 +0200 @@ -1,16 +1,28 @@ CMP0047 ------- -Use QCC compiler id for the qcc drivers on QNX. +Use ``QCC`` compiler id for the qcc drivers on QNX. -CMake 2.8.12 and lower assigned the QNX qcc and QCC compiler drivers the "GNU" -compiler id. +CMake 3.0 and above recognize that the QNX qcc compiler driver is +different from the GNU compiler. +CMake now prefers to present this to projects by setting the +:variable:`CMAKE_<LANG>_COMPILER_ID` variable to ``QCC`` instead +of ``GNU``. However, existing projects may assume the compiler id for +QNX qcc is just ``GNU`` as it was in CMake versions prior to 3.0. +Therefore this policy determines for QNX qcc which compiler id to +report in the :variable:`CMAKE_<LANG>_COMPILER_ID` variable after +language ``<LANG>`` is enabled by the :command:`project` or +:command:`enable_language` command. The policy must be set prior +to the invocation of either command. -The OLD behavior for this policy is to use the "GNU" compiler id for the qcc -and QCC compiler drivers. The NEW behavior for this policy is to use the "QCC" -compiler id for those drivers. +The OLD behavior for this policy is to use the ``GNU`` compiler id +for the qcc and QCC compiler drivers. The NEW behavior for this policy +is to use the ``QCC`` compiler id for those drivers. -This policy was introduced in CMake version 3.0. -CMake version |release| warns when the policy is not set and uses -OLD behavior. Use the cmake_policy command to set it to OLD or -NEW explicitly. +This policy was introduced in CMake version 3.0. Use the +:command:`cmake_policy` command to set this policy to OLD or NEW explicitly. +Unlike most policies, CMake version |release| does *not* warn +by default when this policy is not set and simply uses OLD behavior. +See documentation of the +:variable:`CMAKE_POLICY_WARNING_CMP0047 <CMAKE_POLICY_WARNING_CMP<NNNN>>` +variable to control the warning. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst new/cmake-3.0.0-rc4/Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst --- old/cmake-3.0.0-rc2/Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-3.0.0-rc4/Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst 2014-04-16 19:54:40.000000000 +0200 @@ -0,0 +1,17 @@ +CMAKE_POLICY_WARNING_CMP<NNNN> +------------------------------ + +Explicitly enable or disable the warning when CMake Policy ``CMP<NNNN>`` +is not set. This is meaningful only for the few policies that do not +warn by default: + +* ``CMAKE_POLICY_WARNING_CMP0025`` controls the warning for + policy :policy:`CMP0025`. +* ``CMAKE_POLICY_WARNING_CMP0047`` controls the warning for + policy :policy:`CMP0047`. + +This variable should not be set by a project in CMake code. Project +developers running CMake may set this variable in their cache to +enable the warning (e.g. ``-DCMAKE_POLICY_WARNING_CMP<NNNN>=ON``). +Alternatively, running :manual:`cmake(1)` with the ``--debug-output`` +or ``--trace`` option will also enable the warning. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Modules/CMakeDetermineVSServicePack.cmake new/cmake-3.0.0-rc4/Modules/CMakeDetermineVSServicePack.cmake --- old/cmake-3.0.0-rc2/Modules/CMakeDetermineVSServicePack.cmake 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Modules/CMakeDetermineVSServicePack.cmake 2014-04-16 19:54:40.000000000 +0200 @@ -2,15 +2,15 @@ # CMakeDetermineVSServicePack # --------------------------- # -# Determine the Visual Studio service pack of the 'cl' in use. +# Deprecated. Do not use. # -# The functionality of this module has been superseded by the platform -# variable CMAKE_<LANG>_COMPILER_VERSION that contains the compiler -# version number. +# The functionality of this module has been superseded by the +# :variable:`CMAKE_<LANG>_COMPILER_VERSION` variable that contains +# the compiler version number. # -# Usage: +# Determine the Visual Studio service pack of the 'cl' in use. # -# :: +# Usage:: # # if(MSVC) # include(CMakeDetermineVSServicePack) @@ -21,14 +21,12 @@ # endif() # # Function DetermineVSServicePack sets the given variable to one of the -# following values or an empty string if unknown: -# -# :: +# following values or an empty string if unknown:: # # vc80, vc80sp1 # vc90, vc90sp1 # vc100, vc100sp1 -# vc110, vc110sp1, vc110sp2 +# vc110, vc110sp1, vc110sp2, vc110sp3, vc110sp4 #============================================================================= # Copyright 2009-2013 Kitware, Inc. @@ -68,6 +66,8 @@ set(_version "vc110sp2") elseif(${_cl_version} VERSION_EQUAL "17.00.60610.1") set(_version "vc110sp3") + elseif(${_cl_version} VERSION_EQUAL "17.00.61030") + set(_version "vc110sp4") else() set(_version "") endif() @@ -86,27 +86,14 @@ OUTPUT_QUIET ) - string(REGEX MATCH "Compiler Version [0-9]+.[0-9]+.[0-9]+.[0-9]+" - _cl_version "${_output}") - - if(_cl_version) - string(REGEX MATCHALL "[0-9]+" - _cl_version_list "${_cl_version}") - list(GET _cl_version_list 0 _major) - list(GET _cl_version_list 1 _minor) - list(GET _cl_version_list 2 _patch) - list(GET _cl_version_list 3 _tweak) - + if(_output MATCHES "Compiler Version (([0-9]+)\\.([0-9]+)\\.([0-9]+)(\\.([0-9]+))?)") + set(_cl_version ${CMAKE_MATCH_1}) + set(_major ${CMAKE_MATCH_2}) + set(_minor ${CMAKE_MATCH_3}) if("${_major}${_minor}" STREQUAL "${MSVC_VERSION}") - set(_cl_version ${_major}.${_minor}.${_patch}.${_tweak}) - else() - unset(_cl_version) - endif() - endif() - - if(_cl_version) set(${_SUCCESS_VAR} true PARENT_SCOPE) set(${_VERSION_VAR} ${_cl_version} PARENT_SCOPE) + endif() endif() endif() endfunction() @@ -127,20 +114,9 @@ file(REMOVE "${CMAKE_BINARY_DIR}/return0.cc") - string(REGEX MATCH "Compiler Version [0-9]+.[0-9]+.[0-9]+.[0-9]+" - _cl_version "${_output}") - - if(_cl_version) - string(REGEX MATCHALL "[0-9]+" - _cl_version_list "${_cl_version}") - - list(GET _cl_version_list 0 _major) - list(GET _cl_version_list 1 _minor) - list(GET _cl_version_list 2 _patch) - list(GET _cl_version_list 3 _tweak) - + if(_output MATCHES "Compiler Version (([0-9]+)\\.([0-9]+)\\.([0-9]+)(\\.([0-9]+))?)") set(${_SUCCESS_VAR} true PARENT_SCOPE) - set(${_VERSION_VAR} ${_major}.${_minor}.${_patch}.${_tweak} PARENT_SCOPE) + set(${_VERSION_VAR} "${CMAKE_MATCH_1}" PARENT_SCOPE) endif() endfunction() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Modules/CMakeFortranCompilerABI.F new/cmake-3.0.0-rc4/Modules/CMakeFortranCompilerABI.F --- old/cmake-3.0.0-rc2/Modules/CMakeFortranCompilerABI.F 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Modules/CMakeFortranCompilerABI.F 2014-04-16 19:54:40.000000000 +0200 @@ -10,11 +10,15 @@ PRINT *, 'INFO:sizeof_dptr[8]' #elif defined(_M_AMD64) PRINT *, 'INFO:sizeof_dptr[8]' +#elif defined(__x86_64__) + PRINT *, 'INFO:sizeof_dptr[8]' #elif defined(_ILP32) PRINT *, 'INFO:sizeof_dptr[4]' #elif defined(_M_IX86) PRINT *, 'INFO:sizeof_dptr[4]' +#elif defined(__i386__) + PRINT *, 'INFO:sizeof_dptr[4]' #elif defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ == 8 PRINT *, 'INFO:sizeof_dptr[8]' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Modules/CMakeRCInformation.cmake new/cmake-3.0.0-rc4/Modules/CMakeRCInformation.cmake --- old/cmake-3.0.0-rc2/Modules/CMakeRCInformation.cmake 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Modules/CMakeRCInformation.cmake 2014-04-16 19:54:40.000000000 +0200 @@ -13,15 +13,16 @@ # License text for the above reference.) -# This file sets the basic flags for the Fortran language in CMake. +# This file sets the basic flags for the Windows Resource Compiler. # It also loads the available platform file for the system-compiler # if it exists. # make sure we don't use CMAKE_BASE_NAME from somewhere else set(CMAKE_BASE_NAME) -get_filename_component(CMAKE_BASE_NAME ${CMAKE_RC_COMPILER} NAME_WE) -if("${CMAKE_BASE_NAME}" MATCHES "windres") - set(CMAKE_BASE_NAME "windres") +if(CMAKE_RC_COMPILER MATCHES "windres[^/]*$") + set(CMAKE_BASE_NAME "windres") +else() + get_filename_component(CMAKE_BASE_NAME ${CMAKE_RC_COMPILER} NAME_WE) endif() set(CMAKE_SYSTEM_AND_RC_COMPILER_INFO_FILE ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake) @@ -30,7 +31,7 @@ set (CMAKE_RC_FLAGS "$ENV{RCFLAGS} ${CMAKE_RC_FLAGS_INIT}" CACHE STRING - "Flags for Fortran compiler.") + "Flags for Windows Resource Compiler.") # These are the only types of flags that should be passed to the rc # command, if COMPILE_FLAGS is used on a target this will be used diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Modules/Platform/UnixPaths.cmake new/cmake-3.0.0-rc4/Modules/Platform/UnixPaths.cmake --- old/cmake-3.0.0-rc2/Modules/Platform/UnixPaths.cmake 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Modules/Platform/UnixPaths.cmake 2014-04-16 19:54:40.000000000 +0200 @@ -83,7 +83,7 @@ ) list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES - /lib /usr/lib /usr/lib32 /usr/lib64 + /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 ) list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Modules/Qt4Macros.cmake new/cmake-3.0.0-rc4/Modules/Qt4Macros.cmake --- old/cmake-3.0.0-rc2/Modules/Qt4Macros.cmake 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Modules/Qt4Macros.cmake 2014-04-16 19:54:40.000000000 +0200 @@ -103,7 +103,7 @@ # helper macro to set up a moc rule -macro (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target) +function (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target) # For Windows, create a parameters file to work around command line length limit # Pass the parameters in a file. Set the working directory to # be that containing the parameters file and reference it by @@ -144,7 +144,7 @@ DEPENDS ${infile} ${_moc_working_dir} VERBATIM) -endmacro () +endfunction () macro (QT4_GENERATE_MOC infile outfile ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/CMakeVersion.cmake new/cmake-3.0.0-rc4/Source/CMakeVersion.cmake --- old/cmake-3.0.0-rc2/Source/CMakeVersion.cmake 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/CMakeVersion.cmake 2014-04-16 19:54:40.000000000 +0200 @@ -2,4 +2,4 @@ set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 0) set(CMake_VERSION_PATCH 0) -set(CMake_VERSION_RC 2) +set(CMake_VERSION_RC 4) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/QtDialog/CMakeLists.txt new/cmake-3.0.0-rc4/Source/QtDialog/CMakeLists.txt --- old/cmake-3.0.0-rc2/Source/QtDialog/CMakeLists.txt 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/QtDialog/CMakeLists.txt 2014-04-16 19:54:40.000000000 +0200 @@ -28,7 +28,7 @@ qt5_add_resources(${ARGN}) endmacro() set(CMake_QT_LIBRARIES ${Qt5Widgets_LIBRARIES}) - set(QT_QTMAIN_LIBRARY Qt5::WinMain) + set(QT_QTMAIN_LIBRARY ${Qt5Core_QTMAIN_LIBRARIES}) # Remove this when the minimum version of Qt is 4.6. add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmAddCustomTargetCommand.cxx new/cmake-3.0.0-rc4/Source/cmAddCustomTargetCommand.cxx --- old/cmake-3.0.0-rc2/Source/cmAddCustomTargetCommand.cxx 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmAddCustomTargetCommand.cxx 2014-04-16 19:54:40.000000000 +0200 @@ -165,10 +165,13 @@ if (!nameOk) { cmake::MessageType messageType = cmake::AUTHOR_WARNING; + cmOStringStream e; bool issueMessage = false; switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0037)) { case cmPolicies::WARN: + e << (this->Makefile->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0037)) << "\n"; issueMessage = true; case cmPolicies::OLD: break; @@ -180,9 +183,6 @@ } if (issueMessage) { - cmOStringStream e; - e << (this->Makefile->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0037)) << "\n"; e << "The target name \"" << targetName << "\" is reserved or not valid for certain " "CMake features, such as generator expressions, and may result " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmAddExecutableCommand.cxx new/cmake-3.0.0-rc4/Source/cmAddExecutableCommand.cxx --- old/cmake-3.0.0-rc2/Source/cmAddExecutableCommand.cxx 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmAddExecutableCommand.cxx 2014-04-16 19:54:40.000000000 +0200 @@ -79,10 +79,13 @@ if (!nameOk) { cmake::MessageType messageType = cmake::AUTHOR_WARNING; + cmOStringStream e; bool issueMessage = false; switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0037)) { case cmPolicies::WARN: + e << (this->Makefile->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0037)) << "\n"; issueMessage = true; case cmPolicies::OLD: break; @@ -94,9 +97,6 @@ } if (issueMessage) { - cmOStringStream e; - e << (this->Makefile->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0037)) << "\n"; e << "The target name \"" << exename << "\" is reserved or not valid for certain " "CMake features, such as generator expressions, and may result " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmAddLibraryCommand.cxx new/cmake-3.0.0-rc4/Source/cmAddLibraryCommand.cxx --- old/cmake-3.0.0-rc2/Source/cmAddLibraryCommand.cxx 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmAddLibraryCommand.cxx 2014-04-16 19:54:40.000000000 +0200 @@ -214,11 +214,17 @@ if (!nameOk) { cmake::MessageType messageType = cmake::AUTHOR_WARNING; + cmOStringStream e; bool issueMessage = false; switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0037)) { case cmPolicies::WARN: - issueMessage = type != cmTarget::INTERFACE_LIBRARY; + if(type != cmTarget::INTERFACE_LIBRARY) + { + e << (this->Makefile->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0037)) << "\n"; + issueMessage = true; + } case cmPolicies::OLD: break; case cmPolicies::NEW: @@ -229,9 +235,6 @@ } if (issueMessage) { - cmOStringStream e; - e << (this->Makefile->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0037)) << "\n"; e << "The target name \"" << libName << "\" is reserved or not valid for certain " "CMake features, such as generator expressions, and may result " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmArchiveWrite.cxx new/cmake-3.0.0-rc4/Source/cmArchiveWrite.cxx --- old/cmake-3.0.0-rc2/Source/cmArchiveWrite.cxx 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmArchiveWrite.cxx 2014-04-16 19:54:40.000000000 +0200 @@ -18,6 +18,13 @@ #include <cm_libarchive.h> //---------------------------------------------------------------------------- +static std::string cm_archive_error_string(struct archive* a) +{ + const char* e = archive_error_string(a); + return e? e : "unknown error"; +} + +//---------------------------------------------------------------------------- class cmArchiveWrite::Entry { struct archive_entry* Object; @@ -60,7 +67,7 @@ if(archive_write_set_compression_none(this->Archive) != ARCHIVE_OK) { this->Error = "archive_write_set_compression_none: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return; } break; @@ -68,7 +75,7 @@ if(archive_write_set_compression_compress(this->Archive) != ARCHIVE_OK) { this->Error = "archive_write_set_compression_compress: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return; } break; @@ -76,7 +83,7 @@ if(archive_write_set_compression_gzip(this->Archive) != ARCHIVE_OK) { this->Error = "archive_write_set_compression_gzip: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return; } break; @@ -84,7 +91,7 @@ if(archive_write_set_compression_bzip2(this->Archive) != ARCHIVE_OK) { this->Error = "archive_write_set_compression_bzip2: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return; } break; @@ -92,7 +99,7 @@ if(archive_write_set_compression_lzma(this->Archive) != ARCHIVE_OK) { this->Error = "archive_write_set_compression_lzma: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return; } break; @@ -100,7 +107,7 @@ if(archive_write_set_compression_xz(this->Archive) != ARCHIVE_OK) { this->Error = "archive_write_set_compression_xz: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return; } break; @@ -109,7 +116,7 @@ if (archive_read_disk_set_standard_lookup(this->Disk) != ARCHIVE_OK) { this->Error = "archive_read_disk_set_standard_lookup: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return;; } #endif @@ -119,7 +126,7 @@ if(archive_write_set_format_zip(this->Archive) != ARCHIVE_OK) { this->Error = "archive_write_set_format_zip: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return; } break; @@ -127,7 +134,7 @@ if(archive_write_set_format_pax_restricted(this->Archive) != ARCHIVE_OK) { this->Error = "archive_write_set_format_pax_restricted: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return; } break; @@ -137,7 +144,7 @@ if (archive_write_set_bytes_in_last_block(this->Archive, 1)) { this->Error = "archive_write_set_bytes_in_last_block: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return; } @@ -147,7 +154,7 @@ 0) != ARCHIVE_OK) { this->Error = "archive_write_open: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return; } } @@ -235,7 +242,7 @@ if(archive_read_disk_entry_from_file(this->Disk, e, -1, 0) != ARCHIVE_OK) { this->Error = "archive_read_disk_entry_from_file: "; - this->Error += archive_error_string(this->Disk); + this->Error += cm_archive_error_string(this->Disk); return false; } // Clear acl and xattr fields not useful for distribution. @@ -245,7 +252,7 @@ if(archive_write_header(this->Archive, e) != ARCHIVE_OK) { this->Error = "archive_write_header: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return false; } @@ -292,7 +299,7 @@ if(archive_write_data(this->Archive, buffer, nnext) != nnext_s) { this->Error = "archive_write_data: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return false; } nleft -= nnext; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmComputeTargetDepends.cxx new/cmake-3.0.0-rc4/Source/cmComputeTargetDepends.cxx --- old/cmake-3.0.0-rc2/Source/cmComputeTargetDepends.cxx 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmComputeTargetDepends.cxx 2014-04-16 19:54:40.000000000 +0200 @@ -349,9 +349,12 @@ cmMakefile *makefile = depender->GetMakefile(); cmake::MessageType messageType = cmake::AUTHOR_WARNING; bool issueMessage = false; + cmOStringStream e; switch(depender->GetPolicyStatusCMP0046()) { case cmPolicies::WARN: + e << (makefile->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0046)) << "\n"; issueMessage = true; case cmPolicies::OLD: break; @@ -364,9 +367,7 @@ if(issueMessage) { cmake* cm = this->GlobalGenerator->GetCMakeInstance(); - cmOStringStream e; - e << (makefile->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0046)) << "\n"; + e << "The dependency target \"" << dependee_name << "\" of target \"" << depender->GetName() << "\" does not exist."; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmGlobalGenerator.cxx new/cmake-3.0.0-rc4/Source/cmGlobalGenerator.cxx --- old/cmake-3.0.0-rc2/Source/cmGlobalGenerator.cxx 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmGlobalGenerator.cxx 2014-04-16 19:54:40.000000000 +0200 @@ -759,7 +759,8 @@ switch(mf->GetPolicyStatus(cmPolicies::CMP0025)) { case cmPolicies::WARN: - if(!this->CMakeInstance->GetIsInTryCompile()) + if(!this->CMakeInstance->GetIsInTryCompile() && + mf->PolicyOptionalWarningEnabled("CMAKE_POLICY_WARNING_CMP0025")) { cmOStringStream w; w << policies->GetPolicyWarning(cmPolicies::CMP0025) << "\n" @@ -790,7 +791,8 @@ switch(mf->GetPolicyStatus(cmPolicies::CMP0047)) { case cmPolicies::WARN: - if(!this->CMakeInstance->GetIsInTryCompile()) + if(!this->CMakeInstance->GetIsInTryCompile() && + mf->PolicyOptionalWarningEnabled("CMAKE_POLICY_WARNING_CMP0047")) { cmOStringStream w; w << policies->GetPolicyWarning(cmPolicies::CMP0047) << "\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmIncludeCommand.cxx new/cmake-3.0.0-rc4/Source/cmIncludeCommand.cxx --- old/cmake-3.0.0-rc2/Source/cmIncludeCommand.cxx 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmIncludeCommand.cxx 2014-04-16 19:54:40.000000000 +0200 @@ -98,11 +98,14 @@ if (gg->IsExportedTargetsFile(fname_abs)) { const char *modal = 0; + cmOStringStream e; cmake::MessageType messageType = cmake::AUTHOR_WARNING; switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0024)) { case cmPolicies::WARN: + e << (this->Makefile->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0024)) << "\n"; modal = "should"; case cmPolicies::OLD: break; @@ -114,9 +117,6 @@ } if (modal) { - cmOStringStream e; - e << (this->Makefile->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0024)) << "\n"; e << "The file\n " << fname_abs << "\nwas generated by the export() " "command. It " << modal << " not be used as the argument to the " "include() command. Use ALIAS targets instead to refer to targets " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmLocalGenerator.cxx new/cmake-3.0.0-rc4/Source/cmLocalGenerator.cxx --- old/cmake-3.0.0-rc2/Source/cmLocalGenerator.cxx 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmLocalGenerator.cxx 2014-04-16 19:54:40.000000000 +0200 @@ -263,7 +263,8 @@ for(cmGeneratorTargetsType::iterator t = targets.begin(); t != targets.end(); ++t) { - if (t->second->Target->IsImported()) + if (t->second->Target->IsImported() + || t->second->Target->GetType() == cmTarget::INTERFACE_LIBRARY) { continue; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmMakefile.cxx new/cmake-3.0.0-rc4/Source/cmMakefile.cxx --- old/cmake-3.0.0-rc2/Source/cmMakefile.cxx 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmMakefile.cxx 2014-04-16 19:54:41.000000000 +0200 @@ -893,9 +893,12 @@ { cmake::MessageType messageType = cmake::AUTHOR_WARNING; bool issueMessage = false; + cmOStringStream e; switch(this->GetPolicyStatus(cmPolicies::CMP0040)) { case cmPolicies::WARN: + e << (this->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0040)) << "\n"; issueMessage = true; case cmPolicies::OLD: break; @@ -908,9 +911,6 @@ if(issueMessage) { - cmOStringStream e; - e << (this->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0040)) << "\n"; e << "The target name \"" << target << "\" is unknown in this context."; IssueMessage(messageType, e.str().c_str()); } @@ -926,6 +926,14 @@ this->IssueMessage(cmake::FATAL_ERROR, e.str()); return; } + if(ti->second.GetType() == cmTarget::INTERFACE_LIBRARY) + { + cmOStringStream e; + e << "Target \"" << target << "\" is an INTERFACE library " + "that may not have PRE_BUILD, PRE_LINK, or POST_BUILD commands."; + this->IssueMessage(cmake::FATAL_ERROR, e.str()); + return; + } // Add the command to the appropriate build step for the target. std::vector<std::string> no_output; cmCustomCommand cc(this, no_output, depends, @@ -4342,6 +4350,22 @@ return this->GetPolicies()->GetPolicyStatus(id); } +//---------------------------------------------------------------------------- +bool cmMakefile::PolicyOptionalWarningEnabled(std::string const& var) +{ + // Check for an explicit CMAKE_POLICY_WARNING_CMP<NNNN> setting. + if(!var.empty()) + { + if(const char* val = this->GetDefinition(var.c_str())) + { + return cmSystemTools::IsOn(val); + } + } + // Enable optional policy warnings with --debug-output or --trace. + cmake* cm = this->GetCMakeInstance(); + return cm->GetDebugOutput() || cm->GetTrace(); +} + bool cmMakefile::SetPolicy(const char *id, cmPolicies::PolicyStatus status) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmMakefile.h new/cmake-3.0.0-rc4/Source/cmMakefile.h --- old/cmake-3.0.0-rc2/Source/cmMakefile.h 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmMakefile.h 2014-04-16 19:54:41.000000000 +0200 @@ -875,6 +875,8 @@ std::set<cmStdString> const & GetSystemIncludeDirectories() const { return this->SystemIncludeDirectories; } + bool PolicyOptionalWarningEnabled(std::string const& var); + protected: // add link libraries and directories to the target void AddGlobalLinkInformation(const char* name, cmTarget& target); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmTarget.cxx new/cmake-3.0.0-rc4/Source/cmTarget.cxx --- old/cmake-3.0.0-rc2/Source/cmTarget.cxx 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmTarget.cxx 2014-04-16 19:54:41.000000000 +0200 @@ -2636,11 +2636,14 @@ { return true; } + cmOStringStream e; const char *modal = 0; cmake::MessageType messageType = cmake::AUTHOR_WARNING; switch (this->Makefile->GetPolicyStatus(cmPolicies::CMP0026)) { case cmPolicies::WARN: + e << (this->Makefile->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0026)) << "\n"; modal = "should"; case cmPolicies::OLD: break; @@ -2653,9 +2656,6 @@ if (modal) { - cmOStringStream e; - e << (this->Makefile->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0026)) << "\n"; e << "The LOCATION property " << modal << " not be read from target \"" << this->GetName() << "\". Use the target name directly with " "add_custom_command, or use the generator expression $<TARGET_FILE>, " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmTargetLinkLibrariesCommand.cxx new/cmake-3.0.0-rc4/Source/cmTargetLinkLibrariesCommand.cxx --- old/cmake-3.0.0-rc2/Source/cmTargetLinkLibrariesCommand.cxx 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmTargetLinkLibrariesCommand.cxx 2014-04-16 19:54:41.000000000 +0200 @@ -103,11 +103,14 @@ if (this->Target->GetType() == cmTarget::UTILITY) { + cmOStringStream e; const char *modal = 0; cmake::MessageType messageType = cmake::AUTHOR_WARNING; switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0039)) { case cmPolicies::WARN: + e << this->Makefile->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0039) << "\n"; modal = "should"; case cmPolicies::OLD: break; @@ -119,9 +122,7 @@ } if (modal) { - cmOStringStream e; - e << this->Makefile->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0039) << "\n" + e << "Utility target \"" << this->Target->GetName() << "\" " << modal << " not be used as the target of a target_link_libraries call."; this->Makefile->IssueMessage(messageType, e.str().c_str()); @@ -373,11 +374,14 @@ ? cmTarget::KeywordTLLSignature : cmTarget::PlainTLLSignature; if (!this->Target->PushTLLCommandTrace(sig)) { + cmOStringStream e; const char *modal = 0; cmake::MessageType messageType = cmake::AUTHOR_WARNING; switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0023)) { case cmPolicies::WARN: + e << this->Makefile->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0023) << "\n"; modal = "should"; case cmPolicies::OLD: break; @@ -390,14 +394,12 @@ if(modal) { - cmOStringStream e; // If the sig is a keyword form and there is a conflict, the existing // form must be the plain form. const char *existingSig = (sig == cmTarget::KeywordTLLSignature ? "plain" : "keyword"); - e << this->Makefile->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0023) << "\n" + e << "The " << existingSig << " signature for target_link_libraries " "has already been used with the target \"" << this->Target->GetName() << "\". All uses of " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Templates/TestDriver.cxx.in new/cmake-3.0.0-rc4/Templates/TestDriver.cxx.in --- old/cmake-3.0.0-rc2/Templates/TestDriver.cxx.in 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Templates/TestDriver.cxx.in 2014-04-16 19:54:41.000000000 +0200 @@ -58,7 +58,7 @@ int main(int ac, char *av[]) { - int i, NumTests, testNum, partial_match; + int i, NumTests, testNum = 0, partial_match; char *arg, *test_name; int count; int testToRun = -1; @@ -81,7 +81,6 @@ } printf("To run a test, enter the test number: "); fflush(stdout); - testNum = 0; if( scanf("%d", &testNum) != 1 ) { printf("Couldn't parse that input as a number\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW-stderr.txt 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW-stderr.txt 2014-04-16 19:54:41.000000000 +0200 @@ -1,8 +1,4 @@ CMake Error at CMP0026-CONFIG-LOCATION-NEW.cmake:7 $get_target_property$: - Policy CMP0026 is not set: Disallow use of the LOCATION target property. - Run "cmake --help-policy CMP0026" for policy details. Use the cmake_policy - command to set the policy and suppress this warning. - The LOCATION property may not be read from target "somelib". Use the target name directly with add_custom_command, or use the generator expression \$<TARGET_FILE>, as appropriate. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW-stderr.txt 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW-stderr.txt 2014-04-16 19:54:41.000000000 +0200 @@ -1,8 +1,4 @@ CMake Error at CMP0026-LOCATION-CONFIG-NEW.cmake:7 $get_target_property$: - Policy CMP0026 is not set: Disallow use of the LOCATION target property. - Run "cmake --help-policy CMP0026" for policy details. Use the cmake_policy - command to set the policy and suppress this warning. - The LOCATION property may not be read from target "somelib". Use the target name directly with add_custom_command, or use the generator expression \$<TARGET_FILE>, as appropriate. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-NEW-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-NEW-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-NEW-stderr.txt 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-NEW-stderr.txt 2014-04-16 19:54:41.000000000 +0200 @@ -1,8 +1,4 @@ CMake Error at CMP0026-NEW.cmake:7 $get_target_property$: - Policy CMP0026 is not set: Disallow use of the LOCATION target property. - Run "cmake --help-policy CMP0026" for policy details. Use the cmake_policy - command to set the policy and suppress this warning. - The LOCATION property may not be read from target "somelib". Use the target name directly with add_custom_command, or use the generator expression \$<TARGET_FILE>, as appropriate. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0037/CMP0037-NEW-colon-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0037/CMP0037-NEW-colon-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0037/CMP0037-NEW-colon-stderr.txt 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0037/CMP0037-NEW-colon-stderr.txt 2014-04-16 19:54:41.000000000 +0200 @@ -1,9 +1,4 @@ CMake Error at CMP0037-NEW-colon.cmake:4 $add_library$: - Policy CMP0037 is not set: Target names should not be reserved and should - match a validity pattern. Run "cmake --help-policy CMP0037" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The target name "lib:colon" is reserved or not valid for certain CMake features, such as generator expressions, and may result in undefined behavior. @@ -11,11 +6,6 @@ CMakeLists.txt:3 $include$ + CMake Error at CMP0037-NEW-colon.cmake:5 $add_executable$: - Policy CMP0037 is not set: Target names should not be reserved and should - match a validity pattern. Run "cmake --help-policy CMP0037" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The target name "exe:colon" is reserved or not valid for certain CMake features, such as generator expressions, and may result in undefined behavior. @@ -23,11 +13,6 @@ CMakeLists.txt:3 $include$ + CMake Error at CMP0037-NEW-colon.cmake:6 $add_custom_target$: - Policy CMP0037 is not set: Target names should not be reserved and should - match a validity pattern. Run "cmake --help-policy CMP0037" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The target name "custom:colon" is reserved or not valid for certain CMake features, such as generator expressions, and may result in undefined behavior. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0037/CMP0037-NEW-reserved-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0037/CMP0037-NEW-reserved-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0037/CMP0037-NEW-reserved-stderr.txt 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0037/CMP0037-NEW-reserved-stderr.txt 2014-04-16 19:54:41.000000000 +0200 @@ -1,20 +1,10 @@ CMake Error at CMP0037-NEW-reserved.cmake:4 $add_library$: - Policy CMP0037 is not set: Target names should not be reserved and should - match a validity pattern. Run "cmake --help-policy CMP0037" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The target name "all" is reserved or not valid for certain CMake features, such as generator expressions, and may result in undefined behavior. Call Stack $most recent call first$: CMakeLists.txt:3 $include$ + CMake Error at CMP0037-NEW-reserved.cmake:5 $add_executable$: - Policy CMP0037 is not set: Target names should not be reserved and should - match a validity pattern. Run "cmake --help-policy CMP0037" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The target name "clean" is reserved or not valid for certain CMake features, such as generator expressions, and may result in undefined behavior. @@ -22,11 +12,6 @@ CMakeLists.txt:3 $include$ + CMake Error at CMP0037-NEW-reserved.cmake:6 $add_custom_target$: - Policy CMP0037 is not set: Target names should not be reserved and should - match a validity pattern. Run "cmake --help-policy CMP0037" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The target name "help" is reserved or not valid for certain CMake features, such as generator expressions, and may result in undefined behavior. Call Stack $most recent call first$: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0037/CMP0037-NEW-space-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0037/CMP0037-NEW-space-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0037/CMP0037-NEW-space-stderr.txt 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0037/CMP0037-NEW-space-stderr.txt 2014-04-16 19:54:41.000000000 +0200 @@ -1,9 +1,4 @@ CMake Error at CMP0037-NEW-space.cmake:4 $add_library$: - Policy CMP0037 is not set: Target names should not be reserved and should - match a validity pattern. Run "cmake --help-policy CMP0037" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The target name "lib with spaces" is reserved or not valid for certain CMake features, such as generator expressions, and may result in undefined behavior. @@ -11,11 +6,6 @@ CMakeLists.txt:3 $include$ + CMake Error at CMP0037-NEW-space.cmake:5 $add_executable$: - Policy CMP0037 is not set: Target names should not be reserved and should - match a validity pattern. Run "cmake --help-policy CMP0037" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The target name "exe with spaces" is reserved or not valid for certain CMake features, such as generator expressions, and may result in undefined behavior. @@ -23,11 +13,6 @@ CMakeLists.txt:3 $include$ + CMake Error at CMP0037-NEW-space.cmake:6 $add_custom_target$: - Policy CMP0037 is not set: Target names should not be reserved and should - match a validity pattern. Run "cmake --help-policy CMP0037" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The target name "custom with spaces" is reserved or not valid for certain CMake features, such as generator expressions, and may result in undefined behavior. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0039/CMP0039-NEW-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0039/CMP0039-NEW-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0039/CMP0039-NEW-stderr.txt 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0039/CMP0039-NEW-stderr.txt 2014-04-16 19:54:41.000000000 +0200 @@ -1,8 +1,4 @@ CMake Error at CMP0039-NEW.cmake:7 $target_link_libraries$: - Policy CMP0039 is not set: Utility targets may not have link dependencies. - Run "cmake --help-policy CMP0039" for policy details. Use the cmake_policy - command to set the policy and suppress this warning. - Utility target "utility" must not be used as the target of a target_link_libraries call. Call Stack $most recent call first$: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0040/CMP0040-NEW-missing-target-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0040/CMP0040-NEW-missing-target-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0040/CMP0040-NEW-missing-target-stderr.txt 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0040/CMP0040-NEW-missing-target-stderr.txt 2014-04-16 19:54:41.000000000 +0200 @@ -1,9 +1,4 @@ CMake Error at CMP0040-NEW-missing-target.cmake:3 $add_custom_command$: - Policy CMP0040 is not set: The target in the TARGET signature of - add_custom_command must exist. Run "cmake --help-policy CMP0040" for - policy details. Use the cmake_policy command to set the policy and - suppress this warning. -+ The target name "foobar" is unknown in this context. Call Stack $most recent call first$: CMakeLists.txt:3 $include$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency-stderr.txt 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency-stderr.txt 2014-04-16 19:54:41.000000000 +0200 @@ -1,8 +1,4 @@ CMake Error at CMP0046-NEW-missing-dependency.cmake:4 $add_dependencies$: - Policy CMP0046 is not set: Error on non-existent dependency in - add_dependencies. Run "cmake --help-policy CMP0046" for policy details. - Use the cmake_policy command to set the policy and suppress this warning. -+ The dependency target "bar" of target "foo" does not exist. Call Stack $most recent call first$: CMakeLists.txt:3 $include$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/include/CMP0024-NEW-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/include/CMP0024-NEW-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/include/CMP0024-NEW-stderr.txt 2014-03-17 19:18:31.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/include/CMP0024-NEW-stderr.txt 2014-04-16 19:54:42.000000000 +0200 @@ -1,8 +1,4 @@ CMake Error at subdir2/CMakeLists.txt:2 $include$: - Policy CMP0024 is not set: Disallow include export result. Run "cmake - --help-policy CMP0024" for policy details. Use the cmake_policy command to - set the policy and suppress this warning. - The file .*/Tests/RunCMake/include/CMP0024-NEW-build/subdir1/theTargets.cmake diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/RunCMakeTest.cmake new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/RunCMakeTest.cmake --- old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/RunCMakeTest.cmake 2014-03-17 19:18:31.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/RunCMakeTest.cmake 2014-04-16 19:54:42.000000000 +0200 @@ -8,3 +8,4 @@ run_cmake(global-interface) run_cmake(genex_link) run_cmake(add_dependencies) +run_cmake(add_custom_command-TARGET) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/add_custom_command-TARGET-result.txt new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/add_custom_command-TARGET-result.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/add_custom_command-TARGET-result.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/add_custom_command-TARGET-result.txt 2014-04-16 19:54:42.000000000 +0200 @@ -0,0 +1 @@ +1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/add_custom_command-TARGET-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/add_custom_command-TARGET-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/add_custom_command-TARGET-stderr.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/add_custom_command-TARGET-stderr.txt 2014-04-16 19:54:42.000000000 +0200 @@ -0,0 +1,5 @@ +CMake Error at add_custom_command-TARGET.cmake:4 $add_custom_command$: + Target "iface" is an INTERFACE library that may not have PRE_BUILD, + PRE_LINK, or POST_BUILD commands. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/add_custom_command-TARGET.cmake new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/add_custom_command-TARGET.cmake --- old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/add_custom_command-TARGET.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/add_custom_command-TARGET.cmake 2014-04-16 19:54:42.000000000 +0200 @@ -0,0 +1,6 @@ + +add_library(iface INTERFACE) + +add_custom_command(TARGET iface + COMMAND "${CMAKE_COMMAND}" -E echo test +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/target_link_libraries/CMP0023-NEW-2-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/target_link_libraries/CMP0023-NEW-2-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/target_link_libraries/CMP0023-NEW-2-stderr.txt 2014-03-17 19:18:31.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/target_link_libraries/CMP0023-NEW-2-stderr.txt 2014-04-16 19:54:42.000000000 +0200 @@ -1,9 +1,4 @@ CMake Error at CMP0023-NEW-2.cmake:11 $target_link_libraries$: - Policy CMP0023 is not set: Plain and keyword target_link_libraries - signatures cannot be mixed. Run "cmake --help-policy CMP0023" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The plain signature for target_link_libraries has already been used with the target "foo". All uses of target_link_libraries with a target must be either all-keyword or all-plain. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/target_link_libraries/CMP0023-NEW-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/target_link_libraries/CMP0023-NEW-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/target_link_libraries/CMP0023-NEW-stderr.txt 2014-03-17 19:18:31.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/target_link_libraries/CMP0023-NEW-stderr.txt 2014-04-16 19:54:42.000000000 +0200 @@ -1,9 +1,4 @@ CMake Error at CMP0023-NEW.cmake:11 $target_link_libraries$: - Policy CMP0023 is not set: Plain and keyword target_link_libraries - signatures cannot be mixed. Run "cmake --help-policy CMP0023" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The plain signature for target_link_libraries has already been used with the target "foo". All uses of target_link_libraries with a target must be either all-keyword or all-plain. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openexr for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package openexr for openSUSE:Factory checked in at 2014-04-26 17:01:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openexr (Old) and /work/SRC/openSUSE:Factory/.openexr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openexr" Changes: -------- --- /work/SRC/openSUSE:Factory/openexr/openexr.changes 2013-11-28 18:52:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openexr.new/openexr.changes 2014-04-26 17:01:59.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 24 09:54:12 UTC 2014 - dmueller(a)suse.com + +- remove dependency on gpg-offline (blocks rebuilds and + tarball integrity is checked by source-validator anyway) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openexr.spec ++++++ --- /var/tmp/diff_new_pack.HyS9TF/_old 2014-04-26 17:02:00.000000000 +0200 +++ /var/tmp/diff_new_pack.HyS9TF/_new 2014-04-26 17:02:00.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package openexr # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,9 +31,6 @@ Url: http://www.openexr.com/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake -%if 0%{suse_version} >= 1220 -BuildRequires: gpg-offline -%endif BuildRequires: fltk-devel BuildRequires: freeglut-devel BuildRequires: gcc-c++ @@ -112,7 +109,6 @@ This package contains a documentation %prep -%{?gpg_verify: %gpg_verify %{S:1}} %setup -q %patch0 -p1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0