May 2014 - openSUSE Commits - openSUSE Mailing Lists

commit makedumpfile for openSUSE:Factory
by root＠hilbert.suse.de 10 May '14

10 May '14

Hello community, here is the log from the commit of package makedumpfile for openSUSE:Factory checked in at 2014-05-10 08:32:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old) and /work/SRC/openSUSE:Factory/.makedumpfile.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "makedumpfile" Changes: -------- --- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes 2014-03-23 22:29:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes 2014-05-10 08:32:18.000000000 +0200 @@ -1,0 +2,12 @@ +Wed May 7 14:00:57 UTC 2014 - ptesarik(a)suse.cz + +- upgrade to makedumpfile-1.5.6 + o support for Linux 3.13 + o include sample eppic scripts + o eppic: Add support for module data structures + o ability to filter Xen Dom0 dumps + +- makedumpfile-fix-sprintf-append.patch: now upstream +- makedumpfile-kernel-3.12-supported.patch: now upstream + +------------------------------------------------------------------- Old: ---- makedumpfile-1.5.5.tar.bz2 makedumpfile-fix-sprintf-append.patch makedumpfile-kernel-3.12-supported.patch New: ---- makedumpfile-1.5.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ makedumpfile.spec ++++++ --- /var/tmp/diff_new_pack.T0zOtu/_old 2014-05-10 08:32:19.000000000 +0200 +++ /var/tmp/diff_new_pack.T0zOtu/_new 2014-05-10 08:32:19.000000000 +0200 @@ -39,7 +39,7 @@ BuildRequires: snappy-devel %endif BuildRequires: xz-devel -Version: 1.5.5 +Version: 1.5.6 Release: 0 Summary: Partial kernel dump License: GPL-2.0 @@ -48,8 +48,6 @@ Source: %{name}-%{version}.tar.bz2 Source1: README.static Patch0: %{name}-coptflags.diff -Patch1: %{name}-fix-sprintf-append.patch -Patch2: %{name}-kernel-3.12-supported.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 ppc64le s390x %arm @@ -68,8 +66,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build LIBS_STATIC= @@ -102,6 +98,8 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5 install -c -m 0644 makedumpfile.8 $RPM_BUILD_ROOT%{_mandir}/man8 install -c -m 0644 makedumpfile.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5 +mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/eppic_scripts +install -c -m 644 -t $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/eppic_scripts/ eppic_scripts/* %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -111,5 +109,7 @@ %doc README COPYING IMPLEMENTATION %doc %{_mandir}/man?/* /bin/* +%dir %{_datadir}/%{name}-%{version} +%{_datadir}/%{name}-%{version}/eppic_scripts/ %changelog ++++++ makedumpfile-1.5.5.tar.bz2 -> makedumpfile-1.5.6.tar.bz2 ++++++ ++++ 3113 lines of diff (skipped) ++++++ makedumpfile-coptflags.diff ++++++ --- /var/tmp/diff_new_pack.T0zOtu/_old 2014-05-10 08:32:20.000000000 +0200 +++ /var/tmp/diff_new_pack.T0zOtu/_new 2014-05-10 08:32:20.000000000 +0200 @@ -17,9 +17,9 @@ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE # LDFLAGS = -L/usr/local/lib -I/usr/local/include -@@ -45,9 +45,9 @@ OBJ_PART = print_info.o dwarf_info.o elf +@@ -51,9 +51,9 @@ OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART)) SRC_ARCH = arch/arm.c arch/x86.c arch/x86_64.c arch/ia64.c arch/ppc64.c arch/s390x.c arch/ppc.c - OBJ_ARCH = arch/arm.o arch/x86.o arch/x86_64.o arch/ia64.o arch/ppc64.o arch/s390x.o arch/ppc.o + OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) -LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz +LIBS = -ldw -lebl -lelf $(LIBS_STATIC) -Wl,-Bdynamic -ldl -lz $(LIBS_DYNAMIC) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-storage for openSUSE:Factory
by root＠hilbert.suse.de 10 May '14

10 May '14

Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2014-05-10 08:32:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old) and /work/SRC/openSUSE:Factory/.yast2-storage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-storage" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2014-05-06 13:40:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2014-05-10 08:32:16.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 07 18:12:42 CEST 2014 - aschnell(a)suse.de + +- fixed transition between disk labels in proposal (bnc#875113) +- version 3.1.23 + +------------------------------------------------------------------- Old: ---- yast2-storage-3.1.22.tar.bz2 New: ---- yast2-storage-3.1.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.ps7uOv/_old 2014-05-10 08:32:17.000000000 +0200 +++ /var/tmp/diff_new_pack.ps7uOv/_new 2014-05-10 08:32:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.22 +Version: 3.1.23 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-storage-3.1.22.tar.bz2 -> yast2-storage-3.1.23.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.22/doc/README.part.info new/yast2-storage-3.1.23/doc/README.part.info --- old/yast2-storage-3.1.22/doc/README.part.info 2014-05-05 13:54:50.000000000 +0200 +++ new/yast2-storage-3.1.23/doc/README.part.info 2014-05-07 18:29:43.000000000 +0200 @@ -136,7 +136,7 @@ Keyword: sizepct Example: sizepct=30 Description: - This keyword determines that a partiton should be allocated a certain + This keyword determines that a partition should be allocated a certain percentage of the available space for installation on a disk. Keyword: maxsize @@ -163,13 +163,13 @@ Example: disk=2 Description: This keyword specifies which partitions should be placed on which - disks if multiple disks are present in the system. All partions with + disks if multiple disks are present in the system. All partitions with the same disk value will be placed on the same disk. The value after the keyword determines the priority of the partition group. Lower numbers mean higher priority. If there are not enough disks in the system a partition group with lower priority is assigned a separate disks before a partition group with higher priority. A partition - without disk keyword is implicity assigned the highest priority 0. + without disk keyword is implicitly assigned the highest priority 0. Example: PARTITION mount=/var sizepct=100 disk=3 PARTITION mount=/ size=1GB disk=2 @@ -206,7 +206,7 @@ If more than one of the available disks is eligible to hold a certain partition set, the disk is selected as follows. If there is a partition - allocated on that disk that has its size specified by kewords "sizepct" + allocated on that disk that has its size specified by keywords "sizepct" or by "size=0" and does not have a "maxsize" value set then the desired size for this partition is considered to be unlimited. If a partition group contains a partition which an unlimited desired size, the disk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.22/package/yast2-storage.changes new/yast2-storage-3.1.23/package/yast2-storage.changes --- old/yast2-storage-3.1.22/package/yast2-storage.changes 2014-05-05 13:54:50.000000000 +0200 +++ new/yast2-storage-3.1.23/package/yast2-storage.changes 2014-05-07 18:29:43.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 07 18:12:42 CEST 2014 - aschnell(a)suse.de + +- fixed transition between disk labels in proposal (bnc#875113) +- version 3.1.23 + +------------------------------------------------------------------- Mon May 05 12:04:00 CEST 2014 - aschnell(a)suse.de - fixed space adjustment in proposal for snapshots (bnc#876127) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.22/package/yast2-storage.spec new/yast2-storage-3.1.23/package/yast2-storage.spec --- old/yast2-storage-3.1.22/package/yast2-storage.spec 2014-05-05 13:54:50.000000000 +0200 +++ new/yast2-storage-3.1.23/package/yast2-storage.spec 2014-05-07 18:29:43.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.22 +Version: 3.1.23 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.22/src/clients/inst_target_part.rb new/yast2-storage-3.1.23/src/clients/inst_target_part.rb --- old/yast2-storage-3.1.22/src/clients/inst_target_part.rb 2014-05-05 13:54:50.000000000 +0200 +++ new/yast2-storage-3.1.23/src/clients/inst_target_part.rb 2014-05-07 18:29:43.000000000 +0200 @@ -420,13 +420,13 @@ @ok = create_partitions(@targetMap, @target, @partitions) if !@ok - @reason = _( + reason = _( "Too few partitions are marked for removal or \n" + "the disk is too small. \n" + "To install Linux, select more partitions to \n" + "remove or select a larger disk." ) - display_error_box(@reason) + display_error_box(reason) end @tg = Storage.GetTargetMap @pl = Ops.get_list(@tg, [@target_is, "partitions"], []) @@ -446,10 +446,10 @@ Ops.get_string(p, "mount", "") == "/home" end) == 0 @ok = false - @reason = _( + reason = _( "Not enough space available to propose separate /home." ) - Popup.Error(@reason) + Popup.Error(reason) end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.22/src/include/partitioning/auto_part_create.rb new/yast2-storage-3.1.23/src/include/partitioning/auto_part_create.rb --- old/yast2-storage-3.1.22/src/include/partitioning/auto_part_create.rb 2014-05-05 13:54:50.000000000 +0200 +++ new/yast2-storage-3.1.23/src/include/partitioning/auto_part_create.rb 2014-05-07 18:29:43.000000000 +0200 @@ -1,6 +1,6 @@ # encoding: utf-8 -# Copyright (c) 2012 Novell, Inc. +# Copyright (c) [2012-2014] Novell, Inc. # # All Rights Reserved. # @@ -19,21 +19,17 @@ # To contact Novell about this file by physical or electronic mail, you may # find current contact information at www.novell.com. -# Module: auto_part_create.ycp +# Module: auto_part_create.rb # # Authors: Andreas Schwab (schwab(a)suse.de) # Klaus Kämpf (kkaempf(a)suse.de) # -# Purpose: This module creates the neccessary partitions +# Purpose: This module creates the necessary partitions # in the targetMap -# -# $Id$ -# -# used globals -# -# defined functions + module Yast module PartitioningAutoPartCreateInclude + def initialize_partitioning_auto_part_create(include_target) textdomain "storage" @@ -42,6 +38,7 @@ Yast.import "StorageProposal" end + def create_partitions(tgmap, disk, partitions) tgmap = deep_copy(tgmap) disk = deep_copy(disk) @@ -60,8 +57,11 @@ Builtins.y2milestone("create_partitions flex %1 vm %2", has_flex, vm) Ops.set(disk, "partitions", partitions) if StorageProposal.NeedNewDisklabel(disk) - Ops.set(tgmap, [Ops.get_string(disk, "device", ""), "disklabel"], "gpt") - Ops.set(tgmap, [Ops.get_string(disk, "device", ""), "del_ptable"], true) + # TODO understand reason why "label" and "disklabel" are needed + device = disk["device"] + disk["label"] = tgmap[device]["label"] = "gpt" + disk["disklabel"] = tgmap[device]["disklabel"] = "gpt" + disk["del_ptable"] = tgmap[device]["del_ptable"] = true end keep = Builtins.find(partitions) do |p| !Ops.get_boolean(p, "delete", false) && @@ -205,5 +205,6 @@ Builtins.y2milestone("create_partitions ret %1", ret) ret end + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.22/src/include/partitioning/custom_part_helptexts.rb new/yast2-storage-3.1.23/src/include/partitioning/custom_part_helptexts.rb --- old/yast2-storage-3.1.22/src/include/partitioning/custom_part_helptexts.rb 2014-05-05 13:54:50.000000000 +0200 +++ new/yast2-storage-3.1.23/src/include/partitioning/custom_part_helptexts.rb 2014-05-07 18:29:43.000000000 +0200 @@ -182,14 +182,17 @@ ) end + def ia64_gpt_fix_text _( - "Warning: Your system states that it reqires an EFI \n" + + "Warning: Your system states that it requires an EFI \n" + "boot setup. Since the selected disk does not contain a \n" + "GPT disk label YaST will create a GPT label on this disk.\n" + "\n" + "You need to mark all partitions on this disk for removal.\n" ) end + + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.22/src/modules/StorageProposal.rb new/yast2-storage-3.1.23/src/modules/StorageProposal.rb --- old/yast2-storage-3.1.22/src/modules/StorageProposal.rb 2014-05-05 13:54:50.000000000 +0200 +++ new/yast2-storage-3.1.23/src/modules/StorageProposal.rb 2014-05-07 18:29:43.000000000 +0200 @@ -1312,7 +1312,7 @@ !Ops.get_boolean(conf, "prefer_remove", false)) Builtins.y2milestone("do_pflex desperate mode") tc = Builtins.eval(conf) - @cur_mode = :desparate + @cur_mode = :desperate Ops.set(tc, "keep_partition_fsys", []) Ops.set(tc, "keep_partition_id", []) Ops.set(tc, "keep_partition_num", []) @@ -1373,7 +1373,7 @@ Ops.get_list(conf, "partitions", []) ) tc = try_add_boot(conf, e, false) - @cur_mode = :free if @cur_mode != :desparate + @cur_mode = :free if @cur_mode != :desperate if !Ops.get_boolean(tc, "prefer_remove", false) gap = get_gap_info(e, false) tc = add_cylinder_info(tc, gap) @@ -2686,7 +2686,7 @@ ret = Ops.subtract(ret, 100) elsif @cur_mode == :resize ret = Ops.subtract(ret, 1000) - elsif @cur_mode == :desparate + elsif @cur_mode == :desperate ret = Ops.subtract(ret, 1000000) end Builtins.y2milestone("do_weighting after mode ret %1", ret) @@ -4506,9 +4506,9 @@ target = prepare_part_lists(ddev, target) mode = :free while mode != :end && Builtins.size(sol_disk) == 0 - if mode == :free || mode == :desparate + if mode == :free || mode == :desperate valid = Builtins.listmap(ddev) { |s| { s => true } } - if mode == :desparate + if mode == :desperate ddev = get_disk_try_list(target, false) valid = Builtins.listmap(ddev) { |s| { s => true } } target = prepare_part_lists(ddev, target) @@ -4990,11 +4990,11 @@ elsif mode == :remove && Builtins.find(lb) { |v| v } == nil mode = :resize elsif mode == :resize && Builtins.find(lb) { |v| v } == nil - mode = :desparate - elsif mode == :desparate + mode = :desperate + elsif mode == :desperate mode = :end end - if mode == :desparate && Builtins.size(sol_disk) == 0 + if mode == :desperate && Builtins.size(sol_disk) == 0 max_mb = 0 Builtins.foreach(size_mb) do |s, mb| if Ops.greater_than( @@ -5636,9 +5636,9 @@ target = prepare_part_lists(ddev, target) mode = :free while mode != :end && Builtins.size(sol_disk) == 0 - if mode == :free || mode == :desparate + if mode == :free || mode == :desperate valid = Builtins.listmap(ddev) { |s| { s => true } } - if mode == :desparate + if mode == :desperate ddev = get_disk_try_list(target, false) valid = Builtins.listmap(ddev) { |s| { s => true } } target = prepare_part_lists(ddev, target) @@ -5884,8 +5884,8 @@ elsif mode == :remove && Builtins.find(lb) { |v| v } == nil mode = :resize elsif mode == :resize && Builtins.find(lb) { |v| v } == nil - mode = :desparate - elsif mode == :desparate + mode = :desperate + elsif mode == :desperate mode = :end end end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-users for openSUSE:Factory
by root＠hilbert.suse.de 10 May '14

10 May '14

Hello community, here is the log from the commit of package yast2-users for openSUSE:Factory checked in at 2014-05-10 08:32:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-users (Old) and /work/SRC/openSUSE:Factory/.yast2-users.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-users" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-users/yast2-users.changes 2014-04-26 11:45:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-users.new/yast2-users.changes 2014-05-10 08:32:14.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 7 14:57:31 UTC 2014 - jreidinger(a)suse.com + +- do not modify frozen text from gettext call (bnc#876571) +- 3.1.23 + +------------------------------------------------------------------- Old: ---- yast2-users-3.1.22.tar.bz2 New: ---- yast2-users-3.1.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.bOZ0QJ/_old 2014-05-10 08:32:15.000000000 +0200 +++ /var/tmp/diff_new_pack.bOZ0QJ/_new 2014-05-10 08:32:15.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 3.1.22 +Version: 3.1.23 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-users-3.1.22.tar.bz2 -> yast2-users-3.1.23.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.22/package/yast2-users.changes new/yast2-users-3.1.23/package/yast2-users.changes --- old/yast2-users-3.1.22/package/yast2-users.changes 2014-04-18 10:43:45.000000000 +0200 +++ new/yast2-users-3.1.23/package/yast2-users.changes 2014-05-07 17:13:46.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 7 14:57:31 UTC 2014 - jreidinger(a)suse.com + +- do not modify frozen text from gettext call (bnc#876571) +- 3.1.23 + +------------------------------------------------------------------- Fri Apr 18 08:34:35 UTC 2014 - mfilka(a)suse.com - bnc#872903 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.22/package/yast2-users.spec new/yast2-users-3.1.23/package/yast2-users.spec --- old/yast2-users-3.1.22/package/yast2-users.spec 2014-04-18 10:43:45.000000000 +0200 +++ new/yast2-users-3.1.23/package/yast2-users.spec 2014-05-07 17:13:46.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 3.1.22 +Version: 3.1.23 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.22/src/clients/inst_user_first.rb new/yast2-users-3.1.23/src/clients/inst_user_first.rb --- old/yast2-users-3.1.22/src/clients/inst_user_first.rb 2014-04-18 10:43:46.000000000 +0200 +++ new/yast2-users-3.1.23/src/clients/inst_user_first.rb 2014-05-07 17:13:47.000000000 +0200 @@ -157,13 +157,13 @@ ) # help text for dialog "User Authentication Method" 1/2 - @auth_help = _("Authentication ") << + @auth_help = _("Authentication ") + # help text for dialog "User Authentication Method" 2/2 _("Select Local to authenticate users only by using the " + "local files /etc/passwd and /etc/shadow.") # Help text for password expert dialog - @encryption_help = _("Choose a password encryption method for local and system users.") << + @encryption_help = _("Choose a password encryption method for local and system users.") + # Help text for password expert dialog _("SHA-512 is the current standard hash method. Using other " + "algorithms is not recommended unless needed for compatibility purposes.") @@ -626,7 +626,7 @@ imported = n_("User %s will be imported.", "Users %s will be imported.", @to_import.size) % @to_import.join(",") if @text_mode - auth_line << " " << imported + auth_line += " " + imported else imported_term = Left(Label(imported)) end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libgcrypt for openSUSE:Factory
by root＠hilbert.suse.de 10 May '14

10 May '14

Hello community, here is the log from the commit of package libgcrypt for openSUSE:Factory checked in at 2014-05-10 08:32:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgcrypt (Old) and /work/SRC/openSUSE:Factory/.libgcrypt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgcrypt" Changes: -------- --- /work/SRC/openSUSE:Factory/libgcrypt/libgcrypt.changes 2014-04-05 16:50:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libgcrypt.new/libgcrypt.changes 2014-05-10 08:32:13.000000000 +0200 @@ -1,0 +2,16 @@ +Tue May 6 13:28:33 UTC 2014 - vcizek(a)suse.com + +- add support for SP800-90A DRBG (fate#316929, bnc#856312) + * patches by Stephan Mueller (http://www.chronox.de/drbg.html) + 0001-SP800-90A-Deterministic-Random-Bit-Generator.patch.bz2 + 0002-Compile-DRBG.patch + 0003-Function-definitions-of-interfaces-for-random.c.patch + 0004-Invoke-DRBG-from-common-libgcrypt-RNG-code.patch + 0005-Function-definitions-for-gcry_control-callbacks.patch + 0006-DRBG-specific-gcry_control-requests.patch + 0007-User-interface-to-DRBG.patch + * only after 13.1 (the patches need libgpg-error 1.13) +- drop libgcrypt-fips-allow-legacy.patch (not needed and wasn't + applied anyway) + +------------------------------------------------------------------- Old: ---- libgcrypt-fips-allow-legacy.patch New: ---- 0001-SP800-90A-Deterministic-Random-Bit-Generator.patch.bz2 0002-Compile-DRBG.patch 0003-Function-definitions-of-interfaces-for-random.c.patch 0004-Invoke-DRBG-from-common-libgcrypt-RNG-code.patch 0005-Function-definitions-for-gcry_control-callbacks.patch 0006-DRBG-specific-gcry_control-requests.patch 0007-User-interface-to-DRBG.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgcrypt.spec ++++++ --- /var/tmp/diff_new_pack.HHd3BP/_old 2014-05-10 08:32:14.000000000 +0200 +++ /var/tmp/diff_new_pack.HHd3BP/_new 2014-05-10 08:32:14.000000000 +0200 @@ -43,12 +43,19 @@ Patch7: libgcrypt-1.5.0-LIBGCRYPT_FORCE_FIPS_MODE-env.diff #PATCH-FIX-UPSTREAM: internal functions are supposed to be used inside libgcrypt, mvyskocil(a)suse.com Patch8: libgcrypt-1.6.0-use-intenal-functions.patch -Patch10: libgcrypt-fips-allow-legacy.patch Patch11: libgcrypt-fixed-sizet.patch Patch12: libgcrypt-1.6.1-use-fipscheck.patch Patch13: libgcrypt-1.6.1-fips-cavs.patch #PATCH-FIX-SUSE: bnc#724841, fix a random device opening routine Patch14: libgcrypt-1.6.1-fips-cfgrandom.patch +# add support for SP800-90A DRBG (fate#316929, bnc#856312) +Patch21: 0001-SP800-90A-Deterministic-Random-Bit-Generator.patch.bz2 +Patch22: 0002-Compile-DRBG.patch +Patch23: 0003-Function-definitions-of-interfaces-for-random.c.patch +Patch24: 0004-Invoke-DRBG-from-common-libgcrypt-RNG-code.patch +Patch25: 0005-Function-definitions-for-gcry_control-callbacks.patch +Patch26: 0006-DRBG-specific-gcry_control-requests.patch +Patch27: 0007-User-interface-to-DRBG.patch BuildRequires: automake >= 1.11 BuildRequires: libgpg-error-devel >= 1.11 BuildRequires: libtool @@ -119,10 +126,16 @@ %patch5 -p1 %patch7 -p1 %patch8 -p1 -#%patch10 -p1 %patch11 -p1 %if 0%{?suse_version} > 1310 %patch12 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 +%patch25 -p1 +%patch26 -p1 +%patch27 -p1 %endif %patch13 -p1 %patch14 -p1 ++++++ 0001-SP800-90A-Deterministic-Random-Bit-Generator.patch.bz2 ++++++ ++++ 2375 lines (skipped) ++++++ 0002-Compile-DRBG.patch ++++++ From fe272496f0f9e6e12bfa35f6f1c9d05af9feca2c Mon Sep 17 00:00:00 2001 From: Stephan Mueller <smueller(a)chronox.de> Date: Sat, 8 Mar 2014 23:13:33 +0100 Subject: [PATCH v3 2/7] Compile DRBG To: gcrypt-devel(a)gnupg.org Cc: jeremy.wayne.powell(a)gmail.com Add the drbg.c file to the Makefile. Signed-off-by: Stephan Mueller <smueller(a)chronox.de> --- diff --git a/random/Makefile.am b/random/Makefile.am index c9d587a..e073fa4 100644 --- a/random/Makefile.am +++ b/random/Makefile.am @@ -35,6 +35,7 @@ random.c random.h \ rand-internal.h \ random-csprng.c \ random-fips.c \ +drbg.c \ random-system.c \ rndhw.c ++++++ 0003-Function-definitions-of-interfaces-for-random.c.patch ++++++ From bb91250be3eeb2309285fa9865166cb381104c81 Mon Sep 17 00:00:00 2001 From: Stephan Mueller <smueller(a)chronox.de> Date: Sat, 8 Mar 2014 23:14:16 +0100 Subject: [PATCH v3 3/7] Function definitions of interfaces for random.c To: gcrypt-devel(a)gnupg.org Cc: jeremy.wayne.powell(a)gmail.com Specify the function definitions to be integrated into the common libgcrypt RNG code. Signed-off-by: Stephan Mueller <smueller(a)chronox.de> --- diff --git a/random/rand-internal.h b/random/rand-internal.h index 79b23ac..a169a4b 100644 --- a/random/rand-internal.h +++ b/random/rand-internal.h @@ -88,6 +88,15 @@ gcry_err_code_t _gcry_rngfips_run_external_test (void *context, char *buffer, size_t buflen); void _gcry_rngfips_deinit_external_test (void *context); +/* drbg-gcry.h */ +void _gcry_drbg_init(int full); +void _gcry_drbg_close_fds(void); +void _gcry_drbg_dump_stats(void); +int _gcry_drbg_is_faked (void); +gcry_error_t _gcry_drng_add_bytes (const void *buf, size_t buflen, int quality); +void _gcry_drbg_randomize (void *buffer, size_t length, + enum gcry_random_level level); +gcry_error_t _gcry_drbg_selftest (selftest_report_func_t report); /*-- random-system.c --*/ void _gcry_rngsystem_initialize (int full); ++++++ 0004-Invoke-DRBG-from-common-libgcrypt-RNG-code.patch ++++++ From 6aa1bc1df0dbbf5b4cb06b86f949aa9d80f68700 Mon Sep 17 00:00:00 2001 From: Stephan Mueller <smueller(a)chronox.de> Date: Sat, 8 Mar 2014 23:14:58 +0100 Subject: [PATCH v3 4/7] Invoke DRBG from common libgcrypt RNG code To: gcrypt-devel(a)gnupg.org Cc: jeremy.wayne.powell(a)gmail.com Integrate the DRBG invocation with the common libgcrypt RNG code. This integration replaces the old ANSI X9.31 RNG invocation. As the ANSI X9.31 shall only be invoked in FIPS mode and it is sunset at the end of 2014 for FIPS purposes, a complete replacement with the DRBG is considered appropriate. The DRBG is FIPS approved deterministic random number generator for the forseeable future. Signed-off-by: Stephan Mueller <smueller(a)chronox.de> --- Index: libgcrypt-1.6.1/random/random.c =================================================================== --- libgcrypt-1.6.1.orig/random/random.c 2014-01-29 10:48:38.000000000 +0100 +++ libgcrypt-1.6.1/random/random.c 2014-05-06 14:51:42.350644283 +0200 @@ -153,11 +153,13 @@ _gcry_random_initialize (int full) } if (fips_mode ()) - _gcry_rngfips_initialize (full); + //_gcry_rngfips_initialize (full); + _gcry_drbg_init(full); else if (rng_types.standard) _gcry_rngcsprng_initialize (full); else if (rng_types.fips) - _gcry_rngfips_initialize (full); + _gcry_drbg_init(full); + //_gcry_rngfips_initialize (full); else if (rng_types.system) _gcry_rngsystem_initialize (full); else @@ -174,11 +176,13 @@ _gcry_random_close_fds (void) the entropy gatherer. */ if (fips_mode ()) - _gcry_rngfips_close_fds (); + //_gcry_rngfips_close_fds (); + _gcry_drbg_close_fds (); else if (rng_types.standard) _gcry_rngcsprng_close_fds (); else if (rng_types.fips) - _gcry_rngfips_close_fds (); + //_gcry_rngfips_close_fds (); + _gcry_drbg_close_fds (); else if (rng_types.system) _gcry_rngsystem_close_fds (); else @@ -212,7 +216,8 @@ void _gcry_random_dump_stats (void) { if (fips_mode ()) - _gcry_rngfips_dump_stats (); + //_gcry_rngfips_dump_stats (); + _gcry_drbg_dump_stats (); else _gcry_rngcsprng_dump_stats (); } @@ -271,7 +276,8 @@ int _gcry_random_is_faked (void) { if (fips_mode ()) - return _gcry_rngfips_is_faked (); + //return _gcry_rngfips_is_faked (); + return _gcry_drbg_is_faked (); else return _gcry_rngcsprng_is_faked (); } @@ -301,11 +307,13 @@ static void do_randomize (void *buffer, size_t length, enum gcry_random_level level) { if (fips_mode ()) - _gcry_rngfips_randomize (buffer, length, level); + //_gcry_rngfips_randomize (buffer, length, level); + _gcry_drbg_randomize (buffer, length, level); else if (rng_types.standard) _gcry_rngcsprng_randomize (buffer, length, level); else if (rng_types.fips) - _gcry_rngfips_randomize (buffer, length, level); + //_gcry_rngfips_randomize (buffer, length, level); + _gcry_drbg_randomize (buffer, length, level); else if (rng_types.system) _gcry_rngsystem_randomize (buffer, length, level); else /* default */ @@ -437,7 +445,8 @@ _gcry_create_nonce (void *buffer, size_t nonce generator which is seeded by the RNG actual in use. */ if (fips_mode ()) { - _gcry_rngfips_create_nonce (buffer, length); + //_gcry_rngfips_create_nonce (buffer, length); + _gcry_drbg_randomize (buffer, length, GCRY_WEAK_RANDOM); return; } @@ -514,7 +523,8 @@ gpg_error_t _gcry_random_selftest (selftest_report_func_t report) { if (fips_mode ()) - return _gcry_rngfips_selftest (report); + //return _gcry_rngfips_selftest (report); + return _gcry_drbg_selftest (report); else return 0; /* No selftests yet. */ } @@ -530,6 +540,7 @@ _gcry_random_init_external_test (void ** const void *seed, size_t seedlen, const void *dt, size_t dtlen) { + return GPG_ERR_NOT_SUPPORTED; (void)flags; if (fips_mode ()) return _gcry_rngfips_init_external_test (r_context, flags, key, keylen, @@ -544,6 +555,7 @@ _gcry_random_init_external_test (void ** gcry_err_code_t _gcry_random_run_external_test (void *context, char *buffer, size_t buflen) { + return GPG_ERR_NOT_SUPPORTED; if (fips_mode ()) return _gcry_rngfips_run_external_test (context, buffer, buflen); else @@ -554,6 +566,7 @@ _gcry_random_run_external_test (void *co void _gcry_random_deinit_external_test (void *context) { + return; if (fips_mode ()) _gcry_rngfips_deinit_external_test (context); } ++++++ 0005-Function-definitions-for-gcry_control-callbacks.patch ++++++ From 67106d6e63ae5aff91e8fc7072def4c027546d39 Mon Sep 17 00:00:00 2001 From: Stephan Mueller <smueller(a)chronox.de> Date: Sat, 8 Mar 2014 23:15:43 +0100 Subject: [PATCH v3 5/7] Function definitions for gcry_control callbacks To: gcrypt-devel(a)gnupg.org Cc: jeremy.wayne.powell(a)gmail.com The function definitions implemented in drbg.c which are used for gcry_control. Changes v3: * Remove of set_entropy function call Signed-off-by: Stephan Mueller <smueller(a)chronox.de> --- diff --git a/random/random.h b/random/random.h index 2bc8cab..343b149 100644 --- a/random/random.h +++ b/random/random.h @@ -54,7 +54,9 @@ gcry_err_code_t _gcry_random_run_external_test (void *context, char *buffer, size_t buflen); void _gcry_random_deinit_external_test (void *context); - +/*-- drbg.c --*/ +gpg_err_code_t _gcry_drbg_reinit (u_int32_t flags, struct drbg_string *pers, + struct drbg_test_data *test_data); /*-- rndegd.c --*/ gpg_error_t _gcry_rndegd_set_socket_name (const char *name); ++++++ 0006-DRBG-specific-gcry_control-requests.patch ++++++ From bac07e2002f1de9b9ffad477135a67b1bdcf5d85 Mon Sep 17 00:00:00 2001 From: Stephan Mueller <smueller(a)chronox.de> Date: Sat, 8 Mar 2014 23:16:24 +0100 Subject: [PATCH v3 6/7] DRBG specific gcry_control requests To: gcrypt-devel(a)gnupg.org Cc: jeremy.wayne.powell(a)gmail.com gcry_control GCRYCTL_DRBG_REINIT ================================ This control request re-initializes the DRBG completely, i.e. the entire state of the DRBG is zeroized (with two exceptions listed in GCRYCTL_DRBG_SET_ENTROPY). The control request takes the following values which influences how the DRBG is re-initialized: * __u32 flags: This variable specifies the DRBG type to be used for the next initialization. If set to 0, the previous DRBG type is used for the initialization. The DRBG type is an OR of the mandatory flags of the requested DRBG strength and DRBG cipher type. Optionally, the prediction resistance flag can be ORed into the flags variable. For example: - CTR-DRBG with AES-128 without prediction resistance: DRBG_CTRAES128 - HMAC-DRBG with SHA-512 with prediction resistance: DRBG_HMACSHA512 | DRBG_PREDICTION_RESIST * struct drbg_string *pers: personalization string to be used for initialization. * struct drbg_test_data *test: TEST parameter only -- should be NULL in normal use -- parameter sets predefined "entropy" The variable of flags is independent from the pers/perslen variables. If flags is set to 0 and perslen is set to 0, the current DRBG type is completely reset without using a personalization string. Changes v3: * addition of struct drbg_test_data *test to reinit call * change personalization string invocation to struct drbg_string * remove set_entropy call Signed-off-by: Stephan Mueller <smueller(a)chronox.de> --- diff --git a/src/global.c b/src/global.c index 4e8df86..5c19cca 100644 --- a/src/global.c +++ b/src/global.c @@ -671,6 +671,15 @@ _gcry_vcontrol (enum gcry_ctl_cmds cmd, va_list arg_ptr) rc = GPG_ERR_NOT_IMPLEMENTED; break; + case GCRYCTL_DRBG_REINIT: + { + u_int32_t flags = va_arg (arg_ptr, u_int32_t); + struct drbg_string *pers = va_arg (arg_ptr, struct drbg_string *); + struct drbg_test_data *test_data = va_arg (arg_ptr, struct drbg_test_data *); + rc = _gcry_drbg_reinit(flags, pers, test_data); + } + break; + default: _gcry_set_preferred_rng_type (0); rc = GPG_ERR_INV_OP; ++++++ 0007-User-interface-to-DRBG.patch ++++++ Changes v4: * add fail_seed_source to struct drbg_test_data Signed-off-by: Stephan Mueller <smueller(a)chronox.de> --- diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in index c84a3f7..2a17dcd 100644 --- a/src/gcrypt.h.in +++ b/src/gcrypt.h.in @@ -193,7 +193,7 @@ gcry_error_t gcry_err_make_from_errno (gcry_err_source_t source, int err); /* Return an error value with the system error ERR. */ gcry_err_code_t gcry_error_from_errno (int err); - + /* NOTE: Since Libgcrypt 1.6 the thread callbacks are not anymore used. However we keep it to allow for some source code compatibility if used in the standard way. */ @@ -228,7 +228,7 @@ struct gcry_thread_cbs (GCRY_THREAD_OPTION_PTHREAD | (GCRY_THREAD_OPTION_VERSION << 8))} - + /* A generic context object as used by some functions. */ struct gcry_context; typedef struct gcry_context *gcry_ctx_t; @@ -254,7 +254,7 @@ typedef struct } gcry_buffer_t; - + /* Check that the library fulfills the version requirement. */ const char *gcry_check_version (const char *req_version); @@ -329,13 +329,14 @@ enum gcry_ctl_cmds GCRYCTL_SET_CCM_LENGTHS = 69, GCRYCTL_CLOSE_RANDOM_DEVICE = 70, GCRYCTL_INACTIVATE_FIPS_FLAG = 71, - GCRYCTL_REACTIVATE_FIPS_FLAG = 72 + GCRYCTL_REACTIVATE_FIPS_FLAG = 72, + GCRYCTL_DRBG_REINIT = 73, }; /* Perform various operations defined by CMD. */ gcry_error_t gcry_control (enum gcry_ctl_cmds CMD, ...); - + /* S-expression management. */ /* The object to represent an S-expression as used with the public key @@ -477,7 +478,7 @@ gpg_error_t gcry_sexp_extract_param (gcry_sexp_t sexp, const char *list, ...) _GCRY_GCC_ATTR_SENTINEL(0); - + /******************************************* * * * Multi Precision Integer Functions * @@ -833,7 +834,7 @@ gcry_mpi_t _gcry_mpi_get_const (int no); #endif /* GCRYPT_NO_MPI_MACROS */ - + /************************************ * * * Symmetric Cipher Functions * @@ -1015,7 +1016,7 @@ size_t gcry_cipher_get_algo_blklen (int algo); #define gcry_cipher_test_algo(a) \ gcry_cipher_algo_info( (a), GCRYCTL_TEST_ALGO, NULL, NULL ) - + /************************************ * * * Asymmetric Cipher Functions * @@ -1114,7 +1115,7 @@ gcry_sexp_t gcry_pk_get_param (int algo, const char *name); gcry_error_t gcry_pubkey_get_sexp (gcry_sexp_t *r_sexp, int mode, gcry_ctx_t ctx); - + /************************************ * * @@ -1291,7 +1292,7 @@ void gcry_md_debug (gcry_md_hd_t hd, const char *suffix); #define gcry_md_get_asnoid(a,b,n) \ gcry_md_algo_info((a), GCRYCTL_GET_ASNOID, (b), (n)) - + /********************************************** * * @@ -1411,7 +1412,7 @@ int gcry_mac_map_name (const char *name) _GCRY_GCC_ATTR_PURE; #define gcry_mac_test_algo(a) \ gcry_mac_algo_info( (a), GCRYCTL_TEST_ALGO, NULL, NULL ) - + /****************************** * * * Key Derivation Functions * @@ -1439,7 +1440,7 @@ gpg_error_t gcry_kdf_derive (const void *passphrase, size_t passphraselen, - + /************************************ * * * Random Generating Functions * @@ -1508,7 +1509,7 @@ void gcry_create_nonce (void *buffer, size_t length); - + /*******************************/ /* */ /* Prime Number Functions */ @@ -1567,7 +1568,7 @@ void gcry_prime_release_factors (gcry_mpi_t *factors); gcry_error_t gcry_prime_check (gcry_mpi_t x, unsigned int flags); - + /************************************ * * * Miscellaneous Stuff * @@ -1672,6 +1673,136 @@ int gcry_is_secure (const void *a) _GCRY_GCC_ATTR_PURE; /* Return true if Libgcrypt is in FIPS mode. */ #define gcry_fips_mode_active() !!gcry_control (GCRYCTL_FIPS_MODE_P, 0) +/* DRBG test data */ +struct drbg_test_data { + struct drbg_string *testentropy; /* TEST PARAMETER: test entropy */ + int fail_seed_source:1; /* if set, the seed function will return an + * error */ +}; + +/* DRBG input data structure for DRBG generate with additional information + * string */ +struct drbg_gen { + unsigned char *outbuf; /* output buffer for random numbers */ + unsigned int outlen; /* size of output buffer */ + struct drbg_string *addtl; /* input buffer for + * additional information string */ + struct drbg_test_data *test_data; /* test data */ +}; + +/* + * Concatenation Helper and string operation helper + * + * SP800-90A requires the concatenation of different data. To avoid copying + * buffers around or allocate additional memory, the following data structure + * is used to point to the original memory with its size. In addition, it + * is used to build a linked list. The linked list defines the concatenation + * of individual buffers. The order of memory block referenced in that + * linked list determines the order of concatenation. + */ +/* DRBG string definition */ +struct drbg_string { + const unsigned char *buf; + size_t len; + struct drbg_string *next; +}; + +static inline void drbg_string_fill(struct drbg_string *string, + const unsigned char *buf, size_t len) +{ + string->buf = buf; + string->len = len; + string->next = NULL; +} + +/* this is a wrapper function for users of libgcrypt */ +static inline void gcry_randomize_drbg(void *outbuf, size_t outlen, + enum gcry_random_level level, + struct drbg_string *addtl) +{ + struct drbg_gen genbuf; + genbuf.outbuf = outbuf; + genbuf.outlen = outlen; + genbuf.addtl = addtl; + genbuf.test_data = NULL; + gcry_randomize(&genbuf, 0, level); +} + +/* this is a wrapper function for users of libgcrypt */ +static inline void gcry_randomize_drbg_test(void *outbuf, size_t outlen, + enum gcry_random_level level, + struct drbg_string *addtl, + struct drbg_test_data *test_data) +{ + struct drbg_gen genbuf; + genbuf.outbuf = outbuf; + genbuf.outlen = outlen; + genbuf.addtl = addtl; + genbuf.test_data = test_data; + gcry_randomize(&genbuf, 0, level); +} + + +/* + * DRBG flags bitmasks + * + * 31 (B) 28 19 (A) 0 + * +-+-+-+--------+---+-----------+-----+ + * |~|~|u|~~~~~~~~| 3 | 2 | 1 | + * +-+-+-+--------+- -+-----------+-----+ + * ctl flg| |drbg use selection flags + * + */ + +/* internal state control flags (B) */ +#define DRBG_PREDICTION_RESIST ((u_int32_t)1<<28) + +/* CTR type modifiers (A.1)*/ +#define DRBG_CTRAES ((u_int32_t)1<<0) +#define DRBG_CTRSERPENT ((u_int32_t)1<<1) +#define DRBG_CTRTWOFISH ((u_int32_t)1<<2) +#define DRBG_CTR_MASK (DRBG_CTRAES | DRBG_CTRSERPENT | DRBG_CTRTWOFISH) + +/* HASH type modifiers (A.2)*/ +#define DRBG_HASHSHA1 ((u_int32_t)1<<4) +#define DRBG_HASHSHA224 ((u_int32_t)1<<5) +#define DRBG_HASHSHA256 ((u_int32_t)1<<6) +#define DRBG_HASHSHA384 ((u_int32_t)1<<7) +#define DRBG_HASHSHA512 ((u_int32_t)1<<8) +#define DRBG_HASH_MASK (DRBG_HASHSHA1 | DRBG_HASHSHA224 | \ + DRBG_HASHSHA256 | DRBG_HASHSHA384 | \ + DRBG_HASHSHA512) +/* type modifiers (A.3)*/ +#define DRBG_HMAC ((u_int32_t)1<<12) +#define DRBG_SYM128 ((u_int32_t)1<<13) +#define DRBG_SYM192 ((u_int32_t)1<<14) +#define DRBG_SYM256 ((u_int32_t)1<<15) +#define DRBG_TYPE_MASK (DRBG_HMAC | DRBG_SYM128 | DRBG_SYM192 | \ + DRBG_SYM256) +#define DRBG_CIPHER_MASK (DRBG_CTR_MASK | DRBG_HASH_MASK | DRBG_TYPE_MASK) + +#define DRBG_PR_CTRAES128 (DRBG_PREDICTION_RESIST | DRBG_CTRAES | DRBG_SYM128) +#define DRBG_PR_CTRAES192 (DRBG_PREDICTION_RESIST | DRBG_CTRAES | DRBG_SYM192) +#define DRBG_PR_CTRAES256 (DRBG_PREDICTION_RESIST | DRBG_CTRAES | DRBG_SYM256) +#define DRBG_NOPR_CTRAES128 (DRBG_CTRAES | DRBG_SYM128) +#define DRBG_NOPR_CTRAES192 (DRBG_CTRAES | DRBG_SYM192) +#define DRBG_NOPR_CTRAES256 (DRBG_CTRAES | DRBG_SYM256) +#define DRBG_PR_HASHSHA1 (DRBG_PREDICTION_RESIST | DRBG_HASHSHA1) +#define DRBG_PR_HASHSHA256 (DRBG_PREDICTION_RESIST | DRBG_HASHSHA256) +#define DRBG_PR_HASHSHA384 (DRBG_PREDICTION_RESIST | DRBG_HASHSHA384) +#define DRBG_PR_HASHSHA512 (DRBG_PREDICTION_RESIST | DRBG_HASHSHA512) +#define DRBG_NOPR_HASHSHA1 (DRBG_HASHSHA1) +#define DRBG_NOPR_HASHSHA256 (DRBG_HASHSHA256) +#define DRBG_NOPR_HASHSHA384 (DRBG_HASHSHA384) +#define DRBG_NOPR_HASHSHA512 (DRBG_HASHSHA512) +#define DRBG_PR_HMACSHA1 (DRBG_PREDICTION_RESIST | DRBG_HASHSHA1 | DRBG_HMAC) +#define DRBG_PR_HMACSHA256 (DRBG_PREDICTION_RESIST | DRBG_HASHSHA256|DRBG_HMAC) +#define DRBG_PR_HMACSHA384 (DRBG_PREDICTION_RESIST | DRBG_HASHSHA384|DRBG_HMAC) +#define DRBG_PR_HMACSHA512 (DRBG_PREDICTION_RESIST | DRBG_HASHSHA512|DRBG_HMAC) +#define DRBG_NOPR_HMACSHA1 (DRBG_HASHSHA1 | DRBG_HMAC) +#define DRBG_NOPR_HMACSHA256 (DRBG_HASHSHA256 | DRBG_HMAC) +#define DRBG_NOPR_HMACSHA384 (DRBG_HASHSHA384 | DRBG_HMAC) +#define DRBG_NOPR_HMACSHA512 (DRBG_HASHSHA512 | DRBG_HMAC) #if 0 /* (Keep Emacsens' auto-indent happy.) */ {

1 0

commit xf86-input-evdev for openSUSE:Factory
by root＠hilbert.suse.de 10 May '14

10 May '14

Hello community, here is the log from the commit of package xf86-input-evdev for openSUSE:Factory checked in at 2014-05-10 08:31:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-input-evdev (Old) and /work/SRC/openSUSE:Factory/.xf86-input-evdev.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-input-evdev" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-input-evdev/xf86-input-evdev.changes 2014-03-22 19:46:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-input-evdev.new/xf86-input-evdev.changes 2014-05-10 08:32:10.000000000 +0200 @@ -1,0 +2,16 @@ +Wed May 7 14:29:13 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Update to version 2.8.99.1 (2.9RC1) + The first evdev 2.9 Snapshot. + The biggest changes are the switch to libevdev and support for + server-managed fds. The latter needs server support, so don't + expect it to work on anything but git master. + +------------------------------------------------------------------- +Wed May 7 10:18:23 UTC 2014 - sndirsch(a)suse.com + +- Update to version 2.8.3 + * Only two changes, the REL_DIAL fix restores proper horizontal + scrolling behaviour to a set of Microsoft mice. + +------------------------------------------------------------------- Old: ---- xf86-input-evdev-2.8.2.tar.bz2 New: ---- xf86-input-evdev-2.8.99.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-input-evdev.spec ++++++ --- /var/tmp/diff_new_pack.AJso8J/_old 2014-05-10 08:32:11.000000000 +0200 +++ /var/tmp/diff_new_pack.AJso8J/_new 2014-05-10 08:32:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: xf86-input-evdev -Version: 2.8.2 +Version: 2.8.99.1 Release: 0 Summary: Generic Linux input driver for the Xorg X server License: MIT @@ -31,9 +31,8 @@ #BuildRequires: libtool BuildRequires: pkg-config BuildRequires: pkgconfig(inputproto) +BuildRequires: pkgconfig(libevdev) >= 0.4 BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(mtdev) -BuildRequires: pkgconfig(mtdev) BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: pkgconfig(xorg-server) BuildRequires: pkgconfig(xproto) ++++++ xf86-input-evdev-2.8.2.tar.bz2 -> xf86-input-evdev-2.8.99.1.tar.bz2 ++++++ ++++ 2025 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 libFS for openSUSE:Factory
by root＠hilbert.suse.de 10 May '14

10 May '14

Hello community, here is the log from the commit of package libFS for openSUSE:Factory checked in at 2014-05-10 08:31:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libFS (Old) and /work/SRC/openSUSE:Factory/.libFS.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libFS" Changes: -------- --- /work/SRC/openSUSE:Factory/libFS/libFS.changes 2013-11-26 06:11:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libFS.new/libFS.changes 2014-05-10 08:32:09.000000000 +0200 @@ -1,0 +2,9 @@ +Wed May 7 09:47:51 UTC 2014 - sndirsch(a)suse.com + +- Update to version 1.0.6 + * This minor maintenance release includes fixes for libxtrans 1.3 + compatibility, removal of dead code, and cleanups of issues + found by static analyzers. +- supersedes U_fix_build_with_xtrans_1.3.patch + +------------------------------------------------------------------- Old: ---- U_fix_build_with_xtrans_1.3.patch libFS-1.0.5.tar.bz2 New: ---- libFS-1.0.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libFS.spec ++++++ --- /var/tmp/diff_new_pack.ywkVDz/_old 2014-05-10 08:32:10.000000000 +0200 +++ /var/tmp/diff_new_pack.ywkVDz/_new 2014-05-10 08:32:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libFS # -# 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,7 +18,7 @@ Name: libFS %define lname libFS6 -Version: 1.0.5 +Version: 1.0.6 Release: 0 Summary: X Font Service client library License: MIT @@ -29,7 +29,6 @@ #Git-Web: http://cgit.freedesktop.org/xorg/lib/libFS/ Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.… Source2: baselibs.conf -Patch0: U_fix_build_with_xtrans_1.3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.60, automake, libtool @@ -65,7 +64,6 @@ %prep %setup -q -%patch0 -p1 %build %configure --docdir=%_docdir/%name --disable-static ++++++ libFS-1.0.5.tar.bz2 -> libFS-1.0.6.tar.bz2 ++++++ ++++ 5836 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libFS-1.0.5/ChangeLog new/libFS-1.0.6/ChangeLog --- old/libFS-1.0.5/ChangeLog 2013-05-29 02:18:34.000000000 +0200 +++ new/libFS-1.0.6/ChangeLog 2014-03-16 19:04:02.000000000 +0100 @@ -1,3 +1,220 @@ +commit 88be5c37c40070305e64c4b8dc0a1c1f6ca80440 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Mar 16 10:44:14 2014 -0700 + + libFS 1.0.6 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit e5be46eceee9c0c0d5f0363d3e08b19f86f85fcb +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Jan 3 23:07:12 2014 -0800 + + Use strlcpy instead of strcpy/strncpy if it is available + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit e831ef9246684298c147f9b26de0810b8218c3cb +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Jan 3 21:33:10 2014 -0800 + + Replace malloc(strlen + 1); strcpy() with strdup() + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Jasper St. Pierre <jstpierre(a)mecheye.net> + +commit 980cf8ac0c636ff7ef1fccb9e74f116ac5ea34ae +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Jan 3 21:13:30 2014 -0800 + + Remove unused internal helper _FSWireToEvent + + Since we build with -export-symbols-regex '^FS.*', it wasn't available + to callers outside libFS, and was never called by anything inside libFS. + + Seems to have been imported from XlibInt.c without ever being used. + + Flagged by cppcheck 1.62: + [FSlibInt.c:753]: (style) The function '_FSWireToEvent' is never used. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Jasper St. Pierre <jstpierre(a)mecheye.net> + +commit b9f27dc863c3ca01bb231ee48e84bc60b39d4f1f +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Jan 3 20:55:33 2014 -0800 + + Remove unused internal helper _FSEventsQueued + + Since we build with -export-symbols-regex '^FS.*', it wasn't available + to callers outside libFS, and was never called by anything inside libFS. + + Seems to have been imported from XlibInt.c without ever being used. + + Flagged by cppcheck 1.62: + [FSlibInt.c:180]: (style) The function '_FSEventsQueued' is never used. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Jasper St. Pierre <jstpierre(a)mecheye.net> + +commit 37772516acb95b3c9934252994b7dfdc147dfd23 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Jan 3 20:50:32 2014 -0800 + + Remove unused internal helper _FSAllocScratch + + Since we build with -export-symbols-regex '^FS.*', it wasn't available + to callers outside libFS, and was never called by anything inside libFS. + + Seems to have been imported from XlibInt.c without ever being used. + The _FSserver fields that it used (and nothing else did) are replaced + with "unused" placeholders to maintain struct layout/size. + + Flagged by cppcheck 1.62: + [FSlibInt.c:973]: (style) The function '_FSAllocScratch' is never used. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Jasper St. Pierre <jstpierre(a)mecheye.net> + +commit ac1eb6e3ea54724cf3ab3ad1ccf0595df9e34786 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Jan 3 20:46:48 2014 -0800 + + Remove unused internal helper _FSGetHostname + + Since we build with -export-symbols-regex '^FS.*', it wasn't available + to callers outside libFS, and was never called by anything inside libFS. + + Xtrans provides it's own exact copy of this function, which gets + the name _FSTransGetHostname when built in libFS, nothing in libFS + outside the Xtrans code calls a gethostname() function. + + Flagged by cppcheck 1.62: + [FSlibInt.c:1060]: (style) The function '_FSGetHostname' is never used. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Jasper St. Pierre <jstpierre(a)mecheye.net> + +commit a4c12fe0ca5cb359bffe08b26a92ddcf8e194441 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Jan 3 20:04:33 2014 -0800 + + If EAGAIN == EWOULDBLOCK, only need to check errno for one of them + + Solaris <sys/errno.h> has: + #define EWOULDBLOCK EAGAIN + so checking (errno == EAGAIN || errno == EWOULDBLOCK) is overkill. + + This leads cppcheck 1.62 to complain: + [FSlibInt.c:153] -> [FSlibInt.c:153]: (style) Same expression on both sides of '||'. + [FSlibInt.c:301] -> [FSlibInt.c:301]: (style) Same expression on both sides of '||'. + [FSlibInt.c:379] -> [FSlibInt.c:379]: (style) Same expression on both sides of '||'. + [FSlibInt.c:472] -> [FSlibInt.c:472]: (style) Same expression on both sides of '||'. + + This quiets it, and reduces the number of calls Solaris Studio cc + generates to the __errno() function to get the thread-specific errno value. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Jasper St. Pierre <jstpierre(a)mecheye.net> + +commit b6885f7aedc3b6eba62ffa1edac1e8488d938cea +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Jan 3 19:57:09 2014 -0800 + + Reduce scope & remove unneeded assignment of defaultp in FSGetErrorText() + + Suggested by cppcheck 1.62 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit dcb6c39feb63dcf7e843bd2394a2544fd4e79f9f +Author: Jeremy Huddleston Sequoia <jeremyhu(a)apple.com> +Date: Thu Jan 2 01:03:49 2014 -0800 + + FSOpenServer: Fix double-free in error path + + FSOpenServ.c:266:5: warning: Use of memory after it is freed + OutOfMemory(svr, setup); + ^~~~~~~~~~~~~~~~~~~~~~~ + + Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu(a)apple.com> + +commit 4b0b74f953619164dc2863ee2cd3f09d15c65a51 +Author: Jeremy Huddleston Sequoia <jeremyhu(a)apple.com> +Date: Thu Jan 2 00:49:27 2014 -0800 + + Update error loop to correctly handle error in i==0 case + + FSOpenServ.c:183:3: warning: Function call argument is an uninitialized value + FSfree(alts[i].name); + ^~~~~~~~~~~~~~~~~~~~ + ./FSlibos.h:273:21: note: expanded from macro 'FSfree' + ^~~~~~~~~~~ + + Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu(a)apple.com> + +commit 5ed8b4cf1f1c35ef35a3c94350e6b96646a2a0b7 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Dec 27 11:01:35 2013 -0800 + + Add AC_USE_SYSTEM_EXTENSIONS to expose non-standard extensions + + Required on Solaris to expose fd_mask in <sys/select.h> now that + xtrans 1.3 defines _XOPEN_SOURCE to 600 on Solaris, since fd_mask + is not defined in that version of the XPG standards. + + Fixes build failure: + ../../src/FSConnServ.c: In function '_FSWaitForWritable': + ../../src/FSConnServ.c:166:6: error: 'fd_mask' undeclared (first use in this function) + ../../src/FSConnServ.c:166:6: note: each undeclared identifier is reported only once for each function it appears in + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Daniel Stone <daniel(a)fooishbar.org> + +commit 19ca53de0aae67b1f23085c832b445576c6a0b25 +Author: Adam Jackson <ajax(a)redhat.com> +Date: Fri Nov 1 11:14:58 2013 -0400 + + Fix build with xtrans 1.3 + + ->Readv was in fact being used, oops. Just call straight down to + readv() instead. + + Reviewed-by: Peter Harris <pharris(a)opentext.com> + Signed-off-by: Adam Jackson <ajax(a)redhat.com> + +commit 96243bfec19d0f543de3ef590a482f7f6dcdaa3d +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Mon Jun 24 22:52:09 2013 -0700 + + Drop Cray (WORD64/MUSTCOPY) support + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit d30a927b79ee0faa5f4547d5d60570f8fcd11fc2 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Mon Jun 24 22:46:52 2013 -0700 + + Fix a couple comment typos + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 665fb8c34183bbaba5c7deb045863090082f814b +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Mon Jun 24 22:42:56 2013 -0700 + + Require ANSI C89 pre-processor, drop pre-C89 token pasting support + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 279fbcc23d6cd462e034dec6a9d1378cb86247e3 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue May 28 17:42:06 2013 -0700 + + Fix typo in readme ("xfslsfonts" should be "fslsfonts") + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + commit 9d1458e02fe8dcac68b32917c9b10fa49d7161e7 Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> Date: Tue May 28 17:17:40 2013 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libFS-1.0.5/README new/libFS-1.0.6/README --- old/libFS-1.0.5/README 2013-05-29 02:17:52.000000000 +0200 +++ new/libFS-1.0.6/README 2014-03-16 19:03:42.000000000 +0100 @@ -1,7 +1,7 @@ libFS - X Font Service client library This library is used by clients of X Font Servers (xfs), such as -xfsinfo, xfslsfonts, and the X servers themselves. +xfsinfo, fslsfonts, and the X servers themselves. All questions regarding this software should be directed at the Xorg mailing list: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libFS-1.0.5/compile new/libFS-1.0.6/compile --- old/libFS-1.0.5/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/libFS-1.0.6/compile 2014-03-16 19:03:52.000000000 +0100 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey <tromey(a)cygnus.com>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-automake(a)gnu.org> or send patches to +# <automake-patches(a)gnu.org>. + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to <bug-automake(a)gnu.org>. +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libFS-1.0.5/config.h.in new/libFS-1.0.6/config.h.in --- old/libFS-1.0.5/config.h.in 2013-05-29 02:18:13.000000000 +0200 +++ new/libFS-1.0.6/config.h.in 2014-03-16 19:03:52.000000000 +0100 @@ -30,6 +30,9 @@ /* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H +/* Define to 1 if you have the `strlcpy' function. */ +#undef HAVE_STRLCPY + /* Define to 1 if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H @@ -79,9 +82,6 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL -/* Define as the return type of signal handlers (`int' or `void'). */ -#undef RETSIGTYPE - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS @@ -91,5 +91,40 @@ /* Support UNIX socket connections */ #undef UNIXCONN +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + + /* Version number of package */ #undef VERSION + +/* Define to 1 if on MINIX. */ +#undef _MINIX + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +#undef _POSIX_1_SOURCE + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +#undef _POSIX_SOURCE + +/* Defined if needed to expose struct msghdr.msg_control */ +#undef _XOPEN_SOURCE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libFS-1.0.5/configure.ac new/libFS-1.0.6/configure.ac --- old/libFS-1.0.5/configure.ac 2013-05-29 02:17:52.000000000 +0200 +++ new/libFS-1.0.6/configure.ac 2014-03-16 19:03:42.000000000 +0100 @@ -22,7 +22,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libFS], [1.0.5], +AC_INIT([libFS], [1.0.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [libFS]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -30,6 +30,11 @@ # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) +# Set common system defines for POSIX extensions, such as _GNU_SOURCE +# Must be called before any macros that run the compiler (like +# AC_PROG_LIBTOOL) to avoid autoconf errors. +AC_USE_SYSTEM_EXTENSIONS + # Initialize libtool AC_PROG_LIBTOOL @@ -46,6 +51,9 @@ # Find needed libraries for TCP sockets (pre-pended in $LIBS) XTRANS_CONNECTION_FLAGS +# Checks for library functions. +AC_CHECK_FUNCS([strlcpy]) + # Allow checking code with lint, sparse, etc. XORG_WITH_LINT XORG_LINT_LIBRARY([FS]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libFS-1.0.5/include/X11/fonts/FSlib.h new/libFS-1.0.6/include/X11/fonts/FSlib.h --- old/libFS-1.0.5/include/X11/fonts/FSlib.h 2013-05-29 02:17:52.000000000 +0200 +++ new/libFS-1.0.6/include/X11/fonts/FSlib.h 2014-03-16 19:03:42.000000000 +0100 @@ -148,8 +148,8 @@ int ext_number; Bool (*event_vec[132]) (FSServer *, FSEvent *, fsEvent *); Status (*wire_vec[132]) (FSServer *, FSEvent *, fsEvent *); - char *scratch_buffer; - unsigned long scratch_length; + void *unused_1; /* previously scratch_buffer */ + unsigned long unused_2; /* previously scratch_length */ FSSyncHandler synchandler; unsigned long flags; struct _XtransConnInfo *trans_conn; /* transport connection object */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libFS-1.0.5/src/FSErrDis.c new/libFS-1.0.6/src/FSErrDis.c --- old/libFS-1.0.5/src/FSErrDis.c 2013-05-29 02:17:52.000000000 +0200 +++ new/libFS-1.0.6/src/FSErrDis.c 2014-03-16 19:03:42.000000000 +0100 @@ -84,9 +84,14 @@ { if (nbytes == 0) return 0; +#ifdef HAVE_STRLCPY + if (strlcpy(buffer, defaultp, nbytes) >= nbytes) + return 0; +#else (void) strncpy(buffer, defaultp, nbytes); if ((strlen(defaultp) + 1) > nbytes) buffer[nbytes - 1] = '\0'; +#endif return 1; } @@ -96,8 +101,6 @@ char *buffer, int nbytes) { - - const char *defaultp = NULL; char buf[32]; register _FSExtension *ext; @@ -105,7 +108,7 @@ return 0; snprintf(buf, sizeof(buf), "%d", code); if (code < (FSErrorListSize / sizeof(char *)) && code >= 0) { - defaultp = FSErrorList[code]; + const char *defaultp = FSErrorList[code]; FSGetErrorDatabaseText(svr, "FSProtoError", buf, defaultp, buffer, nbytes); } ext = svr->ext_procs; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libFS-1.0.5/src/FSOpenServ.c new/libFS-1.0.6/src/FSOpenServ.c --- old/libFS-1.0.5/src/FSOpenServ.c 2013-05-29 02:17:52.000000000 +0200 +++ new/libFS-1.0.6/src/FSOpenServ.c 2014-03-16 19:03:42.000000000 +0100 @@ -66,7 +66,7 @@ 0, 0, 0 }; -static void OutOfMemory ( FSServer *svr, char *setup ); +static void OutOfMemory ( FSServer *svr ); FSServer *_FSHeadOfServerList = NULL; @@ -85,13 +85,11 @@ static void OutOfMemory( - FSServer *svr, - char *setup) + FSServer *svr) { if (svr->trans_conn) _FSDisconnectServer(svr->trans_conn); _FSFreeServerStructure(svr); - FSfree(setup); errno = ENOMEM; } @@ -129,10 +127,9 @@ return (FSServer *) NULL; } - if ((svr->server_name = FSmalloc(strlen(server) + 1)) == NULL) { + if ((svr->server_name = strdup(server)) == NULL) { goto fail; } - (void) strcpy(svr->server_name, server); if ((svr->trans_conn = _FSConnectServer(svr->server_name)) == NULL) { goto fail; @@ -179,7 +176,7 @@ altlen = (unsigned int) *ad++; alts[i].name = FSmalloc(altlen + 1); if (!alts[i].name) { - while (--i) { + while (--i >= 0) { FSfree(alts[i].name); } goto fail; @@ -263,7 +260,7 @@ FSfree(alts); FSfree(alt_data); FSfree(auth_data); - OutOfMemory(svr, setup); + OutOfMemory(svr); return (FSServer *) NULL; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libFS-1.0.5/src/FSlibInt.c new/libFS-1.0.6/src/FSlibInt.c --- old/libFS-1.0.5/src/FSlibInt.c 2013-05-29 02:17:52.000000000 +0200 +++ new/libFS-1.0.6/src/FSlibInt.c 2014-03-16 19:03:42.000000000 +0100 @@ -58,6 +58,7 @@ #endif #include <stdio.h> #include "FSlibint.h" +#include <X11/Xtrans/Xtransint.h> #include <X11/Xos.h> static void _EatData32 ( FSServer *svr, unsigned long n ); @@ -65,11 +66,14 @@ /* check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX * systems are broken and return EWOULDBLOCK when they should return EAGAIN + * + * Solaris defines EWOULDBLOCK to be EAGAIN, so don't need to check twice + * for it. */ #ifdef WIN32 #define ETEST() (WSAGetLastError() == WSAEWOULDBLOCK) #else -#if defined(EAGAIN) && defined(EWOULDBLOCK) +#if defined(EAGAIN) && defined(EWOULDBLOCK) && (EAGAIN != EWOULDBLOCK) #define ETEST() (errno == EAGAIN || errno == EWOULDBLOCK) #else #ifdef EAGAIN @@ -172,42 +176,6 @@ svr->last_req = (char *) &_dummy_request; } -int -_FSEventsQueued( - register FSServer *svr, - int mode) -{ - register BytesReadable_t len; - BytesReadable_t pend; - char buf[BUFSIZE]; - register fsReply *rep; - - if (mode == QueuedAfterFlush) { - _FSFlush(svr); - if (svr->qlen) - return (svr->qlen); - } - if (_FSTransBytesReadable(svr->trans_conn, &pend) < 0) - (*_FSIOErrorFunction) (svr); - if ((len = pend) < SIZEOF(fsReply)) - return (svr->qlen); /* _FSFlush can enqueue events */ - else if (len > BUFSIZE) - len = BUFSIZE; - len /= SIZEOF(fsReply); - pend = len * SIZEOF(fsReply); - _FSRead(svr, buf, (long) pend); - - /* no space between comma and type or else macro will die */ - STARTITERATE(rep, fsReply, buf, (len > 0), len--) { - if (rep->generic.type == FS_Error) - _FSError(svr, (fsError *) rep); - else /* must be an event packet */ - _FSEnq(svr, (fsEvent *) rep); - } - ENDITERATE - return (svr->qlen); -} - /* _FSReadEvents - Flush the output queue, * then read as many events as possible (but at least 1) and enqueue them */ @@ -330,137 +298,6 @@ } } -#ifdef WORD64 -/* - * XXX This is a *really* stupid way of doing this.... - */ - -#define PACKBUFFERSIZE 4096 - - -/* - * _FSRead32 - Read bytes from the socket unpacking each 32 bits - * into a long (64 bits on a CRAY computer). - * - */ -static void -_doFSRead32( - register FSServer *svr, - register long *data, - register long size, - register char *packbuffer) -{ - long *lpack, - *lp; - long mask32 = 0x00000000ffffffff; - long maskw, - nwords, - i, - bits; - - _FSReadPad(svr, packbuffer, size); - - lp = data; - lpack = (long *) packbuffer; - nwords = size >> 2; - bits = 32; - - for (i = 0; i < nwords; i++) { - maskw = mask32 << bits; - *lp++ = (*lpack & maskw) >> bits; - bits = bits ^ 32; - if (bits) { - lpack++; - } - } -} - -void -_FSRead32( - FSServer *svr, - long *data, - long len) -{ - char packbuffer[PACKBUFFERSIZE]; - unsigned nwords = (PACKBUFFERSIZE >> 2); /* bytes to CARD32 */ - - for (; len > nwords; len -= nwords, data += nwords) { - _doFSRead32(svr, data, nwords, packbuffer); - } - _doFSRead32(svr, data, len, packbuffer); -} - - - -/* - * _FSRead16 - Read bytes from the socket unpacking each 16 bits - * into a long (64 bits on a CRAY computer). - * - */ -static void -_doFSRead16( - register FSServer *svr, - register short *data, - register long size, - char *packbuffer) -{ - long *lpack, - *lp; - long mask16 = 0x000000000000ffff; - long maskw, - nwords, - i, - bits; - - _FSRead(svr, packbuffer, size); /* don't do a padded read... */ - - lp = (long *) data; - lpack = (long *) packbuffer; - nwords = size >> 1; /* number of 16 bit words to be unpacked */ - bits = 48; - for (i = 0; i < nwords; i++) { - maskw = mask16 << bits; - *lp++ = (*lpack & maskw) >> bits; - bits -= 16; - if (bits < 0) { - lpack++; - bits = 48; - } - } -} - -void -_FSRead16( - FSServer *svr, - short *data, - long len) -{ - char packbuffer[PACKBUFFERSIZE]; - unsigned nwords = (PACKBUFFERSIZE >> 1); /* bytes to CARD16 */ - - for (; len > nwords; len -= nwords, data += nwords) { - _doFSRead16(svr, data, nwords, packbuffer); - } - _doFSRead16(svr, data, len, packbuffer); -} - -void -_FSRead16Pad( - FSServer *svr, - short *data, - long size) -{ - int slop = (size & 3); - short slopbuf[3]; - - _FSRead16(svr, data, size); - if (slop > 0) { - _FSRead16(svr, slopbuf, 4 - slop); - } -} - -#endif /* WORD64 */ - /* * _FSReadPad - Read bytes from the socket taking into account incomplete @@ -491,7 +328,7 @@ size += iov[1].iov_len; ESET(0); - while ((bytes_read = _FSTransReadv(svr->trans_conn, iov, 2)) != size) { + while ((bytes_read = readv(svr->trans_conn->fd, iov, 2)) != size) { if (bytes_read > 0) { size -= bytes_read; @@ -683,7 +520,7 @@ register fsReply *rep, int extra, /* number of 32-bit words expected after the * reply */ - Bool discard)/* should I discard data followind "extra" + Bool discard)/* should I discard data following "extra" * words? */ { /* @@ -909,35 +746,6 @@ return (0); } -/* - * reformat a wire event into an FSEvent structure of the right type. - */ -Bool -_FSWireToEvent( - register FSServer *svr, /* pointer to display structure */ - register FSEvent *re, /* pointer to where event should be - * reformatted */ - register fsEvent *event) /* wire protocol event */ -{ - - re->type = event->type & 0x7f; - ((FSAnyEvent *) re)->serial = _FSSetLastRequestRead(svr, - (fsGenericReply *) event); - ((FSAnyEvent *) re)->send_event = ((event->type & 0x80) != 0); - ((FSAnyEvent *) re)->server = svr; - - /* - * Ignore the leading bit of the event type since it is set when a client - * sends an event rather than the server. - */ - - switch (event->type & 0177) { - default: - return (_FSUnknownWireEvent(svr, re, event)); - } -} - - static const char * _SysErrorMsg(int n) { @@ -1042,7 +850,11 @@ ext && (ext->codes.major_opcode != event->request_code); ext = ext->next); if (ext) +#ifdef HAVE_STRLCPY + strlcpy(buffer, ext->name, sizeof(buffer)); +#else strcpy(buffer, ext->name); +#endif else buffer[0] = '\0'; } @@ -1091,25 +903,6 @@ FSIOErrorHandler _FSIOErrorFunction = _FSDefaultIOError; FSErrorHandler _FSErrorFunction = _FSDefaultError; -/* - * This routine can be used to (cheaply) get some memory within a single - * Xlib routine for scratch space. It is reallocated from the same place - * each time, unless the library needs a large scratch space. - */ -char * -_FSAllocScratch( - register FSServer *svr, - unsigned long nbytes) -{ - if (nbytes > svr->scratch_length) { - if (svr->scratch_buffer != NULL) - FSfree(svr->scratch_buffer); - return (svr->scratch_length = nbytes, - svr->scratch_buffer = FSmalloc(nbytes)); - } - return (svr->scratch_buffer); -} - int FSFree(char *data) { @@ -1141,138 +934,6 @@ #endif /* DataRoutineIsProcedure */ -#ifdef WORD64 -/* - * XXX This is a *really* stupid way of doing this. It should just use - * svr->bufptr directly, taking into account where in the word it is. - */ - -/* - * Data16 - Place 16 bit data in the buffer. - * - * "svr" is a pointer to a FSServer. - * "data" is a pointer to the data. - * "len" is the length in bytes of the data. - */ - -static void -doData16( - register FSServer *svr, - short *data, - unsigned len, - char *packbuffer) -{ - long *lp, - *lpack; - long i, - nwords, - bits; - long mask16 = 0x000000000000ffff; - - lp = (long *) data; - lpack = (long *) packbuffer; - *lpack = 0; - -/* nwords is the number of 16 bit values to be packed, - * the low order 16 bits of each word will be packed - * into 64 bit words - */ - nwords = len >> 1; - bits = 48; - - for (i = 0; i < nwords; i++) { - *lpack ^= (*lp & mask16) << bits; - bits -= 16; - lp++; - if (bits < 0) { - lpack++; - *lpack = 0; - bits = 48; - } - } - Data(svr, packbuffer, len); -} - -void -Data16( - FSServer *svr, - short *data, - unsigned len) -{ - char packbuffer[PACKBUFFERSIZE]; - unsigned nwords = (PACKBUFFERSIZE >> 1); /* bytes to CARD16 */ - - for (; len > nwords; len -= nwords, data += nwords) { - doData16(svr, data, nwords, packbuffer); - } - doData16(svr, data, len, packbuffer); -} - -/* - * Data32 - Place 32 bit data in the buffer. - * - * "svr" is a pointer to a FSServer. - * "data" is a pointer to the data. - * "len" is the length in bytes of the data. - */ - -static -doData32( - register FSServer *svr, - long *data, - unsigned len, - char *packbuffer) -{ - long *lp, - *lpack; - long i, - bits, - nwords; - long mask32 = 0x00000000ffffffff; - - lpack = (long *) packbuffer; - lp = data; - - *lpack = 0; - -/* nwords is the number of 32 bit values to be packed - * the low order 32 bits of each word will be packed - * into 64 bit words - */ - nwords = len >> 2; - bits = 32; - - for (i = 0; i < nwords; i++) { - *lpack ^= (*lp & mask32) << bits; - bits = bits ^ 32; - lp++; - if (bits) { - lpack++; - *lpack = 0; - } - } - Data(svr, packbuffer, len); -} - -void -Data32( - FSServer *svr, - short *data, - unsigned len) -{ - char packbuffer[PACKBUFFERSIZE]; - unsigned nwords = (PACKBUFFERSIZE >> 2); /* bytes to CARD32 */ - - for (; len > nwords; len -= nwords, data += nwords) { - doData32(svr, data, nwords, packbuffer); - } - doData32(svr, data, len, packbuffer); -} - -#endif /* WORD64 */ - - - /* * _FSFreeQ - free the queue of events, called by XCloseServer when there are * no more displays left on the display list @@ -1293,57 +954,6 @@ return; } -#ifdef _POSIX_SOURCE /* stupid makedepend [need if] */ -#ifndef __QNX__ /* QNX's uname nodename entry is not same as tcpip hostname */ -#define NEED_UTSNAME -#endif -#endif -#ifdef hpux -#define NEED_UTSNAME -#endif -#ifdef SVR4 -#ifndef _SEQUENT_ -#define NEED_UTSNAME -#endif -#endif - -#ifdef NEED_UTSNAME -#include <sys/utsname.h> -#endif - - -/* - * _FSGetHostname - similar to gethostname but allows special processing. - */ -int -_FSGetHostname( - char *buf, - int maxlen) -{ - int len; - -#ifdef NEED_UTSNAME - /* - * same host name crock as in server and xinit. - */ - struct utsname name; - - uname(&name); - len = strlen(name.nodename); - if (len >= maxlen) - len = maxlen - 1; - strncpy(buf, name.nodename, len); - buf[len] = '\0'; -#else - buf[0] = '\0'; - (void) gethostname(buf, maxlen); - buf[maxlen - 1] = '\0'; - len = strlen(buf); -#endif /* NEED_UTSNAME */ - - return len; -} - #ifndef _FSANYSET /* * This is not always a macro. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libFS-1.0.5/src/FSlibint.h new/libFS-1.0.6/src/FSlibint.h --- old/libFS-1.0.5/src/FSlibint.h 2013-05-29 02:17:52.000000000 +0200 +++ new/libFS-1.0.6/src/FSlibint.h 2014-03-16 19:03:42.000000000 +0100 @@ -82,20 +82,16 @@ extern XtransConnInfo _FSConnectServer ( char *server_name ); extern void _FSDisconnectServer ( XtransConnInfo trans_conn ); extern void _FSSendClientPrefix ( FSServer *svr, fsConnClientPrefix *client ); -extern int _FSEventsQueued ( FSServer *svr, int mode ); extern unsigned long _FSSetLastRequestRead ( FSServer *svr, fsGenericReply *rep ); extern int _FSUnknownWireEvent ( FSServer *svr, FSEvent *re, fsEvent *event ); extern int _FSUnknownNativeEvent ( FSServer *svr, FSEvent *re, fsEvent *event ); -extern int _FSWireToEvent ( FSServer *svr, FSEvent *re, fsEvent *event ); extern int _FSDefaultIOError ( FSServer *svr ) _X_NORETURN; extern int _FSPrintDefaultError ( FSServer *svr, FSErrorEvent *event, FILE *fp ); extern int _FSDefaultError ( FSServer *svr, FSErrorEvent *event ); -extern char * _FSAllocScratch ( FSServer *svr, unsigned long nbytes ); extern void _FSFreeQ ( void ); -extern int _FSGetHostname ( char *buf, int maxlen ); extern FSErrorHandler FSSetErrorHandler ( FSErrorHandler handler ); extern FSIOErrorHandler FSSetIOErrorHandler ( FSIOErrorHandler handler ); @@ -113,30 +109,9 @@ #define FSlibServerIOError (1L << 0) #define FSlibServerClosing (1L << 1) -/* Need to start requests on 64 bit word boundries - * on a CRAY computer so add a NoOp (127) if needed. - * A character pointer on a CRAY computer will be non-zero - * after shifting right 61 bits of it is not pointing to - * a word boundary. - */ - -#ifdef WORD64 -#define WORD64ALIGN if ((long)svr->bufptr >> 61) {\ - svr->last_req = svr->bufptr;\ - *(svr->bufptr) = FS_Noop;\ - *(svr->bufptr+1) = 0;\ - *(svr->bufptr+2) = 0;\ - *(svr->bufptr+3) = 1;\ - svr->request += 1;\ - svr->bufptr += 4;\ - } -#else /* else does not require alignment on 64-bit - * boundaries */ -#define WORD64ALIGN -#endif /* WORD64 */ /* - * GetReq - Get the next avilable FS request packet in the buffer and + * GetReq - Get the next available FS request packet in the buffer and * return it. * * "name" is the name of the request, e.g. InternAtom, OpenFont, etc. @@ -144,9 +119,7 @@ * */ -#if !defined(UNIXCPP) || defined(ANSICPP) #define GetReq(name, req) \ - WORD64ALIGN\ if ((svr->bufptr + SIZEOF(fs##name##Req)) > svr->bufmax)\ _FSFlush(svr);\ req = (fs##name##Req *)(svr->last_req = svr->bufptr);\ @@ -155,25 +128,10 @@ svr->bufptr += SIZEOF(fs##name##Req);\ svr->request++ -#else /* non-ANSI C uses empty comment instead of - * "##" for token concatenation */ -#define GetReq(name, req) \ - WORD64ALIGN\ - if ((svr->bufptr + SIZEOF(fs/**/name/**/Req)) > svr->bufmax)\ - _FSFlush(svr);\ - req = (fs/**/name/**/Req *)(svr->last_req = svr->bufptr);\ - req->reqType = FS_/**/name;\ - req->length = (SIZEOF(fs/**/name/**/Req))>>2;\ - svr->bufptr += SIZEOF(fs/**/name/**/Req);\ - svr->request++ -#endif - /* GetReqExtra is the same as GetReq, but allocates "n" additional bytes after the request. "n" must be a multiple of 4! */ -#if !defined(UNIXCPP) || defined(ANSICPP) #define GetReqExtra(name, n, req) \ - WORD64ALIGN\ if ((svr->bufptr + SIZEOF(fs##name##Req) + n) > svr->bufmax)\ _FSFlush(svr);\ req = (fs##name##Req *)(svr->last_req = svr->bufptr);\ @@ -181,18 +139,6 @@ req->length = (SIZEOF(fs##name##Req) + n)>>2;\ svr->bufptr += SIZEOF(fs##name##Req) + n;\ svr->request++ -#else -#define GetReqExtra(name, n, req) \ - WORD64ALIGN\ - if ((svr->bufptr + SIZEOF(fs/**/name/**/Req) + n) > svr->bufmax)\ - _FSFlush(svr);\ - req = (fs/**/name/**/Req *)(svr->last_req = svr->bufptr);\ - req->reqType = FS_/**/name;\ - req->length = (SIZEOF(fs/**/name/**/Req) + n)>>2;\ - svr->bufptr += SIZEOF(fs/**/name/**/Req) + n;\ - svr->request++ -#endif - /* * GetResReq is for those requests that have a resource ID @@ -200,9 +146,7 @@ * "rid" is the name of the resource. */ -#if !defined(UNIXCPP) || defined(ANSICPP) #define GetResReq(name, rid, req) \ - WORD64ALIGN\ if ((svr->bufptr + SIZEOF(fsResourceReq)) > svr->bufmax)\ _FSFlush(svr);\ req = (fsResourceReq *) (svr->last_req = svr->bufptr);\ @@ -211,27 +155,13 @@ req->id = (rid);\ svr->bufptr += SIZEOF(fsResourceReq);\ svr->request++ -#else -#define GetResReq(name, rid, req) \ - WORD64ALIGN\ - if ((svr->bufptr + SIZEOF(fsResourceReq)) > svr->bufmax)\ - _FSFlush(svr);\ - req = (fsResourceReq *) (svr->last_req = svr->bufptr);\ - req->reqType = FS_/**/name;\ - req->length = 2;\ - req->id = (rid);\ - svr->bufptr += SIZEOF(fsResourceReq);\ - svr->request++ -#endif /* * GetEmptyReq is for those requests that have no arguments * at all. */ -#if !defined(UNIXCPP) || defined(ANSICPP) #define GetEmptyReq(name, req) \ - WORD64ALIGN\ if ((svr->bufptr + SIZEOF(fsReq)) > svr->bufmax)\ _FSFlush(svr);\ req = (fsReq *) (svr->last_req = svr->bufptr);\ @@ -239,17 +169,6 @@ req->length = 1;\ svr->bufptr += SIZEOF(fsReq);\ svr->request++ -#else -#define GetEmptyReq(name, req) \ - WORD64ALIGN\ - if ((svr->bufptr + SIZEOF(fsReq)) > svr->bufmax)\ - _FSFlush(svr);\ - req = (fsReq *) (svr->last_req = svr->bufptr);\ - req->reqType = FS_/**/name;\ - req->length = 1;\ - svr->bufptr += SIZEOF(fsReq);\ - svr->request++ -#endif #define SyncHandle() \ if (svr->synchandler) (*svr->synchandler)(svr) @@ -300,13 +219,11 @@ /* * provide emulation routines for smaller architectures */ -#ifndef WORD64 #define Data16(dpy, data, len) Data((dpy), (char *)(data), (len)) #define Data32(dpy, data, len) Data((dpy), (char *)(data), (len)) #define _FSRead16Pad(dpy, data, len) _FSReadPad((dpy), (char *)(data), (len)) #define _FSRead16(dpy, data, len) _FSRead((dpy), (char *)(data), (len)) #define _FSRead32(dpy, data, len) _FSRead((dpy), (char *)(data), (len)) -#endif /* not WORD64 */ #define PackData16(dpy,data,len) Data16 (dpy, data, len) #define PackData32(dpy,data,len) Data32 (dpy, data, len) @@ -314,20 +231,6 @@ #define min(a,b) (((a) < (b)) ? (a) : (b)) #define max(a,b) (((a) > (b)) ? (a) : (b)) -#ifdef MUSTCOPY -/* a little bit of magic */ -#define OneDataCard32(svr,dstaddr,srcvar) \ - { svr->bufptr -= 4; Data32 (svr, (char *) &(srcvar), 4); } - -#define STARTITERATE(tpvar,type,start,endcond,decr) \ - { register char *cpvar; \ - for (cpvar = (char *) start; endcond; cpvar = NEXTPTR(cpvar,type), decr) { \ - type dummy; memmove ((char *) &dummy, cpvar, SIZEOF(type)); \ - tpvar = (type *) cpvar; -#define ENDITERATE }} - -#else - /* srcvar must be a variable for large architecture version */ #define OneDataCard32(svr,dstaddr,srcvar) \ { *(unsigned long *)(dstaddr) = (srcvar); } @@ -335,15 +238,9 @@ #define STARTITERATE(tpvar,type,start,endcond,decr) \ for (tpvar = (type *) start; endcond; tpvar++, decr) { #define ENDITERATE } -#endif /* MUSTCOPY - used machines whose C structs - * don't line up with proto */ -#if !defined(UNIXCPP) || defined(ANSICPP) #define FSCat(x,y) x##_##y -#else -#define FSCat(x,y) x/**/_/**/y -#endif /* copy XCharInfo parts of a protocol reply into a FSXCharInfo */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libFS-1.0.5/src/FSlibos.h new/libFS-1.0.6/src/FSlibos.h --- old/libFS-1.0.5/src/FSlibos.h 2013-05-29 02:17:52.000000000 +0200 +++ new/libFS-1.0.6/src/FSlibos.h 2014-03-16 19:03:42.000000000 +0100 @@ -129,12 +129,7 @@ #undef dirty #endif -#ifdef WORD64 -#define NMSKBITS 64 -#else #define NMSKBITS 32 -#endif - #define MSKCNT ((FS_OPEN_MAX + NMSKBITS - 1) / NMSKBITS) #ifdef LONG64 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit php5 for openSUSE:Factory
by root＠hilbert.suse.de 10 May '14

10 May '14

Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at 2014-05-10 08:31:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5 (Old) and /work/SRC/openSUSE:Factory/.php5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5" Changes: -------- --- /work/SRC/openSUSE:Factory/php5/php5.changes 2014-05-02 09:52:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2014-05-10 08:32:06.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 7 12:08:46 UTC 2014 - pgajdos(a)suse.com + +- updated to 5.5.12: Fixed several bugs against PHP 5.5.11, + as well as CVE-2014-0185 regarding PHP-FPM. +- improved build-test.sh + +------------------------------------------------------------------- Old: ---- php-5.5.11.tar.bz2 New: ---- php-5.5.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.T4oan6/_old 2014-05-10 08:32:08.000000000 +0200 +++ /var/tmp/diff_new_pack.T4oan6/_new 2014-05-10 08:32:08.000000000 +0200 @@ -104,7 +104,7 @@ %define apache2_includedir %(%{apxs2} -q INCLUDEDIR) %define apache2_serverroot %(%{apxs2} -q PREFIX) %define need_libxml2_hack %(if [ -e %{_includedir}/libxml/parser.h ]; then if grep -q XML_PARSE_OLDSAX %{_includedir}/libxml/parser.h;then echo 1; else echo 0; fi; else echo 0; fi) -Version: 5.5.11 +Version: 5.5.12 Release: 0 Provides: php Provides: php-api = %{apiver} ++++++ build-test.sh ++++++ --- /var/tmp/diff_new_pack.T4oan6/_old 2014-05-10 08:32:08.000000000 +0200 +++ /var/tmp/diff_new_pack.T4oan6/_new 2014-05-10 08:32:08.000000000 +0200 @@ -25,11 +25,15 @@ apiurl="-A $apiurl" fi osc $apiurl build $@ --no-verify --with make_test php5.spec +if [ $? -ne 0 ]; then + echo "ERROR: build failed. See $OSC_BUILD_ROOT/.build.log for details." + exit 1 +fi cat $OSC_BUILD_ROOT/.build.log \ - | sed 's:\r: :' \ - | egrep 'TEST [0-9]+\/[0-9]+|SKIP.*reason' \ - | sed 's:^\[[ 0-9]\+s\] ::' \ - | sed 's:\[[^\]]*\.phpt\][ \t]*$::' \ + | sed 's:^\[[ 0-9]\+s\] ::' \ + | egrep 'TEST [0-9]+\/[0-9]+|SKIP.*reason' \ + | sed 's:.*\r::' \ + | sort \ > ${TEST_RESULT_FILE}.new if [ ! -e ${TEST_RESULT_FILE} ]; then ++++++ php-5.5.11.tar.bz2 -> php-5.5.12.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/php5/php-5.5.11.tar.bz2 /work/SRC/openSUSE:Factory/.php5.new/php-5.5.12.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xf86-input-synaptics for openSUSE:Factory
by root＠hilbert.suse.de 10 May '14

10 May '14

Hello community, here is the log from the commit of package xf86-input-synaptics for openSUSE:Factory checked in at 2014-05-10 08:31:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-input-synaptics (Old) and /work/SRC/openSUSE:Factory/.xf86-input-synaptics.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-input-synaptics" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-input-synaptics/xf86-input-synaptics.changes 2014-03-22 19:46:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-input-synaptics.new/xf86-input-synaptics.changes 2014-05-10 08:32:03.000000000 +0200 @@ -1,0 +2,18 @@ +Wed May 7 10:36:16 UTC 2014 - sndirsch(a)suse.com + +- Update to version 1.7.99.2 + * The second snapshot for synaptics 1.8 is now available. Note + that there are are two significant changes: + - the event device is not grabbed anymore. In some setups this + may lead to duplicate events but where it does you're really + better off using an InputClass instead of an InputDevice + section in your xorg.conf. + - the secondary software button area (i.e. the top software + buttons on the Lenovo *40 series) is now automatically + enabled based on the INPUT_PROP_TOPBUTTONPAD property, + slated for kernel 3.15. No more PNPID matching in the + snippets, which didn't work without a kernel patch anyway. + If you can't update the kernel, use Option + "HasSecondarySoftButtons" "on". + +------------------------------------------------------------------- Old: ---- xf86-input-synaptics-1.7.99.1.tar.bz2 New: ---- xf86-input-synaptics-1.7.99.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-input-synaptics.spec ++++++ --- /var/tmp/diff_new_pack.Mqut5b/_old 2014-05-10 08:32:04.000000000 +0200 +++ /var/tmp/diff_new_pack.Mqut5b/_new 2014-05-10 08:32:04.000000000 +0200 @@ -17,7 +17,7 @@ Name: xf86-input-synaptics -Version: 1.7.99.1 +Version: 1.7.99.2 Release: 0 Summary: Synaptics touchpad input driver for the Xorg X server License: MIT ++++++ xf86-input-synaptics-1.7.99.1.tar.bz2 -> xf86-input-synaptics-1.7.99.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-synaptics-1.7.99.1/ChangeLog new/xf86-input-synaptics-1.7.99.2/ChangeLog --- old/xf86-input-synaptics-1.7.99.1/ChangeLog 2014-03-17 22:32:13.000000000 +0100 +++ new/xf86-input-synaptics-1.7.99.2/ChangeLog 2014-04-30 03:45:03.000000000 +0200 @@ -1,3 +1,167 @@ +commit a31ecb669f40d8db3ab1867eaedfe364bbd6fafe +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed Apr 30 07:45:34 2014 +1000 + + synaptics 1.7.99.2 + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit efa424b5c9c084c1c1136a68329709c7dc9ddfda +Author: Clinton Sprain <clintonsprain(a)gmail.com> +Date: Tue Apr 29 19:47:17 2014 -0500 + + Fix product ID cutoff for MODEL_APPLETOUCH/MODEL_UNIBODY_MACBOOK + + Some Macbooks are being tagged as MODEL_UNIBODY_MACBOOKs when they should not + be. This causes the default sensitivity to be very low for them, making the + touchpad almost unusable. This change puts those devices into the correct + bucket again. + + Signed-off-by: Clinton Sprain <clintonsprain(a)gmail.com> + Reviewed-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 7bf27568417691e772e715f8fc6c30ea7ec892d6 +Author: Hans de Goede <hdegoede(a)redhat.com> +Date: Tue Apr 22 18:58:11 2014 +0200 + + Add support for INPUT_PROP_TOPBUTTONPAD + + Add a HasSecondaryButtons boolean config option which defaults to true for + devices with the INPUT_PROP_TOPBUTTONPAD and false for all other devices. + + Only parse the SecondarySoftButtonAreas when this option is true, effectively + disabling the top buttons when it is false. Likewise, only initialize the + SecondarySoftButtonAreas property if we enable support for it. + + This means that it is now safe to always set a SecondarySoftButtonAreas + default in 50-synaptics.conf, and that he section which was intended for + use with future pnp-id matching can be dropped, as that is now all handled + in the kernel. + + While at also remove the comment about disabling the bottom edge area, as that + is now done automatically. + + Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Hans de Goede <hdegoede(a)redhat.com> + +commit 41afac2abf12dd74a171f726b57014f7fb266957 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue Apr 29 12:13:10 2014 +1000 + + man: add some missing quotes + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit a6f0f4c9a5bcb0e25343dd4c59d4cc47cc5e8006 +Author: Hans de Goede <hdegoede(a)redhat.com> +Date: Fri Apr 11 20:41:36 2014 +0200 + + Always count tripletap + click as 3 fingerclick on pads with < 3 touches + + When trying to do a 3 fingerclick on a touchpad which only tracks 2 touches, + this may register as a 3 or 2 fingerclick depending on the order in which + the touchpad detects the fingers. If the 2 outer fingers of the 3 get seen + first, then the 2 touches will be too far apart for the heuristic to see + them as being close together, and the click gets counted as a 2 finger click. + + A user will likely never do a 2 finger click with a 3th finger resting + somewhere else on the pad, where-as the above misdetection of the clicks is + a real issue, so simply always count a click with trippletap set as a + 3 finger click on pads which track less then 3 touches. + + https://bugzilla.redhat.com/show_bug.cgi?id=1086218 + + Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> + Reviewed-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit f183c1c38778b659b4c75a0e2c532dd5a9f8d437 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed Apr 9 10:41:29 2014 +1000 + + conf: add more PnPIDs and DMI matches for Lenovos + + And expand DMI strings to more precise matches + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Hans de Goede <hdegoede(a)redhat.com> + +commit 62ef210d11714703345dc8d35915ff53c37aee01 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Mon Apr 7 16:16:13 2014 +1000 + + Comment the touch states + + Everytime I look at this I get confused about OPEN_EMPTY vs EMPTY. Let's fix + that. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Hans de Goede <hdegoede(a)redhat.com> + +commit bfceb1bc580656aceb14e4b0f880bfcb3e4bc368 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Fri Apr 4 15:51:22 2014 +1000 + + eventcomm: Hook up the libevdev log handler + + This is a bit problematic: libevdev only has one global log handler. + So if we have another driver use libevdev, we'll either overwrite that handler + or get overwritten, whichever comes first. So we need to re-set the handler + every time we get an event to make sure we log through our handler. + Likewise, if we ever drop the device, we need to unset the log handler back to + NULL because we may unload the module and our handler may disappear. + + Use the lowest logging priority, let the server filter based on the verbosity + level instead. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Hans de Goede <hdegoede(a)redhat.com> + +commit 6ad856790630393bbd41b0bd7746ed9b0629a7c6 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu Apr 3 16:41:15 2014 +1000 + + eventcomm: read one more event after finishing a sync + + Once the sync finishes, we get -EAGAIN. This only indicates the sync is done, + but some events may still be waiting in the pipe for us to read. We must read + those now, otherwise select may not trigger on further data. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Hans de Goede <hdegoede(a)redhat.com> + +commit bec41416dbbee73eef9eee122d0acacc148e329d +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu Apr 3 15:42:45 2014 +1000 + + eventcomm: drop superflous helper function + + last_mt_vals_slot is only used in one location and there we can just use + cur_slot + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Hans de Goede <hdegoede(a)redhat.com> + +commit f1948e08ee9894864254a18098e4f4fceb6e322f +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed Mar 19 15:08:15 2014 +1000 + + Disable GrabEventDevice by default + + This was required when we started supporting hotplugging to avoid duplicate + events. These days the drawback of not being able to record events in the case + of a bug is significant. + + Check the configuration source on init. If the device was hotplugged through a + a server config backend, disable the grab. If the device was statically + configured through an xorg.conf then leave the default grab enabled to avoid + a duplicate device. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Hans de Goede <hdegoede(a)redhat.com> + commit fd709900445e3cb9f31ce7e780bfa98ecb6dab9b Author: Peter Hutterer <peter.hutterer(a)who-t.net> Date: Tue Mar 18 07:28:44 2014 +1000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-synaptics-1.7.99.1/conf/11-x11-synaptics.fdi new/xf86-input-synaptics-1.7.99.2/conf/11-x11-synaptics.fdi --- old/xf86-input-synaptics-1.7.99.1/conf/11-x11-synaptics.fdi 2014-03-14 07:05:24.000000000 +0100 +++ new/xf86-input-synaptics-1.7.99.2/conf/11-x11-synaptics.fdi 2014-04-29 07:15:01.000000000 +0200 @@ -37,7 +37,8 @@ </match> <match - key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains_outof="T440;X240;T540;Helix;S1Yoga"> + key="/org/freedesktop/Hal/devices/computer:system.hardware.version" + contains_outof="ThinkPad T440;ThinkPad X240;ThinkPad T540;ThinkPad Helix;ThinkPad S1 Yoga;ThinkPad L440;ThinkPad X1 Carbon 2nd;ThinkPad T431;ThinkPad L540"> <match key="input.product" contains="Synaptics"> <merge key="input.x11_options.ClickPad" type="string">on</merge> <merge key="input.x11_options.SecondarySoftButtonAreas" type="string">58% 0 0 8% 42% 58% 0 8%</merge> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-synaptics-1.7.99.1/conf/50-synaptics.conf new/xf86-input-synaptics-1.7.99.2/conf/50-synaptics.conf --- old/xf86-input-synaptics-1.7.99.1/conf/50-synaptics.conf 2014-03-14 07:05:05.000000000 +0100 +++ new/xf86-input-synaptics-1.7.99.2/conf/50-synaptics.conf 2014-04-29 07:15:01.000000000 +0200 @@ -25,16 +25,15 @@ Option "Ignore" "on" EndSection -# This option enables the bottom right corner to be a right button on -# non-synaptics clickpads. +# This option enables the bottom right corner to be a right button on clickpads +# and the right and middle top areas to be right / middle buttons on clickpads +# with a top button area. # This option is only interpreted by clickpads. Section "InputClass" Identifier "Default clickpad buttons" MatchDriver "synaptics" Option "SoftButtonAreas" "50% 0 82% 0 0 0 0 0" -# To disable the bottom edge area so the buttons only work as buttons, -# not for movement, set the AreaBottomEdge -# Option "AreaBottomEdge" "82%" + Option "SecondarySoftButtonAreas" "58% 0 0 8% 42% 58% 0 8%" EndSection # This option disables software buttons on Apple touchpads. @@ -45,18 +44,3 @@ MatchDriver "synaptics" Option "SoftButtonAreas" "0 0 0 0 0 0 0 0" EndSection - -# The Lenovo *40 series has no physical button for the TrackPoint and needs -# the top softbutton area enabled by default. -# Affected devices and their PNPIDs -# LEN0033: Helix -# LEN0034: T540 -# LEN0035: X240 -# LEN0036: T440 -# LEN0042: Yoga -Section "InputClass" - Identifier "Lenovo TrackPoint top software buttons" - MatchDriver "synaptics" - MatchPnPID "LEN0033*|LEN0034*|LEN0035*|LEN0036*|LEN0042*" - Option "SecondarySoftButtonAreas" "58% 0 0 8% 42% 58% 0 8%" -EndSection diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-synaptics-1.7.99.1/configure new/xf86-input-synaptics-1.7.99.2/configure --- old/xf86-input-synaptics-1.7.99.1/configure 2014-03-17 22:29:13.000000000 +0100 +++ new/xf86-input-synaptics-1.7.99.2/configure 2014-04-30 03:41:38.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xf86-input-synaptics 1.7.99.1. +# Generated by GNU Autoconf 2.69 for xf86-input-synaptics 1.7.99.2. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='xf86-input-synaptics' PACKAGE_TARNAME='xf86-input-synaptics' -PACKAGE_VERSION='1.7.99.1' -PACKAGE_STRING='xf86-input-synaptics 1.7.99.1' +PACKAGE_VERSION='1.7.99.2' +PACKAGE_STRING='xf86-input-synaptics 1.7.99.2' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -1376,7 +1376,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xf86-input-synaptics 1.7.99.1 to adapt to many kinds of systems. +\`configure' configures xf86-input-synaptics 1.7.99.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1447,7 +1447,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-input-synaptics 1.7.99.1:";; + short | recursive ) echo "Configuration of xf86-input-synaptics 1.7.99.2:";; esac cat <<\_ACEOF @@ -1584,7 +1584,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-input-synaptics configure 1.7.99.1 +xf86-input-synaptics configure 1.7.99.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1908,7 +1908,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-input-synaptics $as_me 1.7.99.1, which was +It was created by xf86-input-synaptics $as_me 1.7.99.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2776,7 +2776,7 @@ # Define the identity of the package. PACKAGE='xf86-input-synaptics' - VERSION='1.7.99.1' + VERSION='1.7.99.2' cat >>confdefs.h <<_ACEOF @@ -18918,7 +18918,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-input-synaptics $as_me 1.7.99.1, which was +This file was extended by xf86-input-synaptics $as_me 1.7.99.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18984,7 +18984,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xf86-input-synaptics config.status 1.7.99.1 +xf86-input-synaptics config.status 1.7.99.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-synaptics-1.7.99.1/configure.ac new/xf86-input-synaptics-1.7.99.2/configure.ac --- old/xf86-input-synaptics-1.7.99.1/configure.ac 2014-03-17 22:28:40.000000000 +0100 +++ new/xf86-input-synaptics-1.7.99.2/configure.ac 2014-04-30 03:41:03.000000000 +0200 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-input-synaptics], - [1.7.99.1], + [1.7.99.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xf86-input-synaptics]) AC_CONFIG_SRCDIR([Makefile.am]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-synaptics-1.7.99.1/man/synaptics.man new/xf86-input-synaptics-1.7.99.2/man/synaptics.man --- old/xf86-input-synaptics-1.7.99.1/man/synaptics.man 2014-03-17 05:57:34.000000000 +0100 +++ new/xf86-input-synaptics-1.7.99.2/man/synaptics.man 2014-04-29 07:15:01.000000000 +0200 @@ -495,17 +495,28 @@ Property: "Synaptics Soft Button Areas" . .TP -.BI "Option \*qSecondarySoftButtonAreas\*q \*q" "RBL RBR RBT RBB MBL MBR MBT MBB" \*q +.BI "Option \*qHasSecondarySoftButtons\*q \*q" boolean \*q This option is only available on ClickPad devices. -Enable secondary soft button click area support on ClickPad devices (usually on +Enable the secondary software button area support. The exact area must be +set in option \*qSecondarySoftButtonAreas\*q. See +.B ClickPad support +for more details. +. +.TP +.BI "Option \*qSecondarySoftButtonAreas\*q \*q" "RBL RBR RBT RBB MBL MBR MBT MBB" \*q +This option is only available on ClickPad devices and only if +.B Option \*qHasSecondarySoftButtons\*q +is enabled. +Define the secondary soft button click areas on ClickPad devices (usually on top of the device). For the allowed values for this option, see .B Option \*qSoftButtonAreas\*q. Primary and secondary soft button areas must not overlap each other. If they do, the behavior of the driver is undefined. Property: "Synaptics Secondary Soft Button Areas". This property is only -initialized if the option is set in the -__xconfigfile__(__filemansuffix__). +initialized if +.B Option \*qHasSecondarySoftButtons\*q +is enabled and this option is set in the __xconfigfile__(__filemansuffix__). . .SH CONFIGURATION DETAILS @@ -722,16 +733,22 @@ driver. .LP ClickPads provide software emulated buttons through -.B Option SoftButtonAreas. +.B Option \*qSoftButtonAreas\*q. These buttons enable areas on the touchpad to perform as right or middle mouse button. When the user performs a click within a defined soft button area, a right or middle click is performed. .LP Some laptops, most notably the Lenovo T440, T540 and x240 series, provide a pointing stick without physical buttons. On those laptops, the top of the -touchpad acts as software-emulated button area. This area can be configured +touchpad acts as software-emulated button area. This area can be enabled +with +.B Option \*qHasSecondarySoftButtons\*q +and configured with -.B Option SecondarySoftButtonAreas. +.B Option \*qSecondarySoftButtonAreas\*q. +On some platforms, this option +will be set automatically if the kernel detects a matching device. On Linux, +the device must have the INPUT_PROP_TOPBUTTONPAD property set. .SH "DEVICE PROPERTIES" Synaptics 1.0 and higher support input device properties if the driver is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-synaptics-1.7.99.1/src/eventcomm.c new/xf86-input-synaptics-1.7.99.2/src/eventcomm.c --- old/xf86-input-synaptics-1.7.99.1/src/eventcomm.c 2014-03-14 07:05:05.000000000 +0100 +++ new/xf86-input-synaptics-1.7.99.2/src/eventcomm.c 2014-04-30 03:41:03.000000000 +0200 @@ -50,6 +50,9 @@ #ifndef INPUT_PROP_SEMI_MT #define INPUT_PROP_SEMI_MT 0x03 #endif +#ifndef INPUT_PROP_TOPBUTTONPAD +#define INPUT_PROP_TOPBUTTONPAD 0x04 +#endif #ifndef ABS_MT_TOOL_Y #define ABS_MT_TOOL_Y 0x3d #endif @@ -87,12 +90,46 @@ enum libevdev_read_flag read_flag; }; +static void +libevdev_log_func(enum libevdev_log_priority priority, + void *data, + const char *file, int line, const char *func, + const char *format, va_list args) +_X_ATTRIBUTE_PRINTF(6, 0); + +static void +libevdev_log_func(enum libevdev_log_priority priority, + void *data, + const char *file, int line, const char *func, + const char *format, va_list args) +{ + int verbosity; + + switch(priority) { + case LIBEVDEV_LOG_ERROR: verbosity = 0; break; + case LIBEVDEV_LOG_INFO: verbosity = 4; break; + case LIBEVDEV_LOG_DEBUG: verbosity = 10; break; + } + + LogVMessageVerbSigSafe(X_NOTICE, verbosity, format, args); +} + +static void +set_libevdev_log_handler(void) +{ + /* be quiet, gcc *handwave* */ + libevdev_set_log_function((libevdev_log_func_t)libevdev_log_func, NULL); + libevdev_set_log_priority(LIBEVDEV_LOG_DEBUG); +} + struct eventcomm_proto_data * EventProtoDataAlloc(int fd) { struct eventcomm_proto_data *proto_data; int rc; + set_libevdev_log_handler(); + proto_data = calloc(1, sizeof(struct eventcomm_proto_data)); if (!proto_data) return NULL; @@ -110,16 +147,6 @@ return proto_data; } -static int -last_mt_vals_slot(const SynapticsPrivate * priv) -{ - struct eventcomm_proto_data *proto_data = - (struct eventcomm_proto_data *) priv->proto_data; - int value = proto_data->cur_slot; - - return value < priv->num_slots ? value : -1; -} - static void UninitializeTouch(InputInfoPtr pInfo) { @@ -191,6 +218,8 @@ struct eventcomm_proto_data *proto_data = (struct eventcomm_proto_data *) priv->proto_data; + set_libevdev_log_handler(); + if (libevdev_get_fd(proto_data->evdev) != -1) { struct input_event ev; @@ -234,6 +263,8 @@ UninitializeTouch(pInfo); libevdev_grab(proto_data->evdev, LIBEVDEV_UNGRAB); + libevdev_set_log_function(NULL, NULL); + libevdev_set_log_priority(LIBEVDEV_LOG_INFO); /* reset to default */ return Success; } @@ -306,7 +337,9 @@ {0x0002, 0x0007, 0x0007, MODEL_SYNAPTICS}, {0x0002, 0x0008, 0x0008, MODEL_ALPS}, {0x05ac, PRODUCT_ANY, 0x222, MODEL_APPLETOUCH}, - {0x05ac, 0x223, PRODUCT_ANY, MODEL_UNIBODY_MACBOOK}, + {0x05ac, 0x223, 0x228, MODEL_UNIBODY_MACBOOK}, + {0x05ac, 0x229, 0x22b, MODEL_APPLETOUCH}, + {0x05ac, 0x22c, PRODUCT_ANY, MODEL_UNIBODY_MACBOOK}, {0x0002, 0x000e, 0x000e, MODEL_ELANTECH}, {0x0, 0x0, 0x0, 0x0} }; @@ -501,8 +534,10 @@ if (rc != -EAGAIN) { LogMessageVerbSigSafe(X_ERROR, 0, "%s: Read error %d\n", pInfo->name, errno); - } else if (proto_data->read_flag == LIBEVDEV_READ_FLAG_SYNC) + } else if (proto_data->read_flag == LIBEVDEV_READ_FLAG_SYNC) { proto_data->read_flag = LIBEVDEV_READ_FLAG_NORMAL; + return SynapticsReadEvent(pInfo, ev); + } return FALSE; } @@ -549,7 +584,7 @@ proto_data->cur_slot = ev->value; } else { - int slot_index = last_mt_vals_slot(priv); + int slot_index = proto_data->cur_slot; if (slot_index < 0) return; @@ -633,6 +668,8 @@ struct eventcomm_proto_data *proto_data = priv->proto_data; Bool sync_cumulative = FALSE; + set_libevdev_log_handler(); + SynapticsResetTouchHwState(hw, FALSE); /* Reset cumulative values if buttons were not previously pressed, @@ -770,6 +807,11 @@ xf86IDrvMsg(pInfo, X_INFO, "found clickpad property\n"); para->clickpad = TRUE; } + + if (libevdev_has_property(dev, INPUT_PROP_TOPBUTTONPAD)) { + xf86IDrvMsg(pInfo, X_INFO, "found top buttonpad property\n"); + para->has_secondary_buttons = TRUE; + } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-synaptics-1.7.99.1/src/properties.c new/xf86-input-synaptics-1.7.99.2/src/properties.c --- old/xf86-input-synaptics-1.7.99.1/src/properties.c 2014-03-14 05:50:57.000000000 +0100 +++ new/xf86-input-synaptics-1.7.99.2/src/properties.c 2014-04-29 07:15:01.000000000 +0200 @@ -176,6 +176,9 @@ prop_softbutton_areas = InitAtom(pInfo->dev, SYNAPTICS_PROP_SOFTBUTTON_AREAS, 32, 8, values); + if (!para->has_secondary_buttons) + return; + values[0] = para->softbutton_areas[TOP_RIGHT_BUTTON_AREA][LEFT]; values[1] = para->softbutton_areas[TOP_RIGHT_BUTTON_AREA][RIGHT]; values[2] = para->softbutton_areas[TOP_RIGHT_BUTTON_AREA][TOP]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-synaptics-1.7.99.1/src/synaptics.c new/xf86-input-synaptics-1.7.99.2/src/synaptics.c --- old/xf86-input-synaptics-1.7.99.1/src/synaptics.c 2014-03-17 05:57:34.000000000 +0100 +++ new/xf86-input-synaptics-1.7.99.2/src/synaptics.c 2014-04-30 03:41:03.000000000 +0200 @@ -576,6 +576,8 @@ int width, height, diag, range; int horizHyst, vertHyst; int middle_button_timeout; + int grab_event_device = 0; + const char *source; /* The synaptics specs specify typical edge widths of 4% on x, and 5.4% on * y (page 7) [Synaptics TouchPad Interfacing Guide, 510-000080 - A @@ -672,6 +674,10 @@ pars->tap_time_2 = xf86SetIntOption(opts, "MaxDoubleTapTime", 180); pars->click_time = xf86SetIntOption(opts, "ClickTime", 100); pars->clickpad = xf86SetBoolOption(opts, "ClickPad", pars->clickpad); /* Probed */ + if (pars->clickpad) + pars->has_secondary_buttons = xf86SetBoolOption(opts, + "HasSecondarySoftButtons", + pars->has_secondary_buttons); pars->clickpad_ignore_motion_time = 100; /* ms */ /* middle mouse button emulation on a clickpad? nah, you're joking */ middle_button_timeout = pars->clickpad ? 0 : 75; @@ -747,7 +753,16 @@ xf86SetRealOption(opts, "PressureMotionMinFactor", 1.0); pars->press_motion_max_factor = xf86SetRealOption(opts, "PressureMotionMaxFactor", 1.0); - pars->grab_event_device = xf86SetBoolOption(opts, "GrabEventDevice", TRUE); + + /* Only grab the device by default if it's not coming from a config + backend. This way we avoid the device being added twice and sending + duplicate events. + */ + source = xf86CheckStrOption(opts, "_source", NULL); + if (source == NULL || strncmp(source, "server/", 7) != 0) + grab_event_device = TRUE; + pars->grab_event_device = xf86SetBoolOption(opts, "GrabEventDevice", grab_event_device); + pars->tap_and_drag_gesture = xf86SetBoolOption(opts, "TapAndDragGesture", TRUE); pars->resolution_horiz = @@ -766,7 +781,8 @@ } set_primary_softbutton_areas_option(pInfo); - set_secondary_softbutton_areas_option(pInfo); + if (pars->has_secondary_buttons) + set_secondary_softbutton_areas_option(pInfo); } static double @@ -2662,26 +2678,11 @@ } /* Some trackpads touchpad only track two touchpoints but announce - BTN_TOOL_TRIPLETAP (which sets hw->numFingers to 3). - This can affect clickfingers, in the following ways: - * one finger down: normal click - * two fingers down, close together: 2 finger click - * two fingers down, apart: normal click - * three fingers down, close together: 3 finger click - * three fingers down, with two grouped next to each other: should be - * 2-finger click but we can't detect this. - * so: if two detected fingers are close together and HW says three - * fingers, make it three fingers. - * if two detected fingers are apart and HW says three fingers, make - * it a two-finger click, guessing that the third finger is somewhere - * close to another finger. - */ - if (hw->numFingers >= 3 && nfingers < hw->numFingers) { - if (!nfingers) /* touchpoints too far apart */ - nfingers = 2; - else - nfingers++; - } + * BTN_TOOL_TRIPLETAP (which sets hw->numFingers to 3), when this happens + * the user likely intents to do a 3 finger click, so handle it as such. + */ + if (hw->numFingers >= 3 && hw->num_mt_mask < 3) + nfingers = 3; return nfingers; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-synaptics-1.7.99.1/src/synapticsstr.h new/xf86-input-synaptics-1.7.99.2/src/synapticsstr.h --- old/xf86-input-synaptics-1.7.99.1/src/synapticsstr.h 2014-03-14 05:51:02.000000000 +0100 +++ new/xf86-input-synaptics-1.7.99.2/src/synapticsstr.h 2014-04-29 07:15:01.000000000 +0200 @@ -176,6 +176,7 @@ int tap_time_2; /* max. tapping time for double taps */ int click_time; /* The duration of a single click */ Bool clickpad; /* Device is a has integrated buttons */ + Bool has_secondary_buttons; /* Device has a top soft-button area */ int clickpad_ignore_motion_time; /* Ignore motion for X ms after a click */ int emulate_mid_button_time; /* Max time between left and right button presses to emulate a middle button press. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-synaptics-1.7.99.1/src/synproto.h new/xf86-input-synaptics-1.7.99.2/src/synproto.h --- old/xf86-input-synaptics-1.7.99.1/src/synproto.h 2014-03-14 07:05:05.000000000 +0100 +++ new/xf86-input-synaptics-1.7.99.2/src/synproto.h 2014-04-29 07:15:01.000000000 +0200 @@ -44,11 +44,11 @@ typedef struct _SynapticsPrivateRec SynapticsPrivate; enum SynapticsSlotState { - SLOTSTATE_EMPTY = 0, - SLOTSTATE_OPEN, - SLOTSTATE_CLOSE, - SLOTSTATE_OPEN_EMPTY, - SLOTSTATE_UPDATE, + SLOTSTATE_EMPTY = 0, /* no slot in this cycle */ + SLOTSTATE_OPEN, /* tracking ID received */ + SLOTSTATE_CLOSE, /* tracking ID -1 received */ + SLOTSTATE_OPEN_EMPTY, /* previously had tracking id, no events in this read cycle */ + SLOTSTATE_UPDATE, /* had tracking id, other events in this cycle */ }; /* used to mark emulated hw button state */ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xauth for openSUSE:Factory
by root＠hilbert.suse.de 10 May '14

10 May '14

Hello community, here is the log from the commit of package xauth for openSUSE:Factory checked in at 2014-05-10 08:31:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xauth (Old) and /work/SRC/openSUSE:Factory/.xauth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xauth" Changes: -------- --- /work/SRC/openSUSE:Factory/xauth/xauth.changes 2013-10-29 09:40:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xauth.new/xauth.changes 2014-05-10 08:32:02.000000000 +0200 @@ -1,0 +2,9 @@ +Wed May 7 10:01:28 UTC 2014 - sndirsch(a)suse.com + +- Update to version 1.0.9 + * Add AC_USE_SYSTEM_EXTENSIONS to expose non-standard extensions + * Do not install test_xauth during "make install" as it is + * Fix warning about warn_unused_result triggered by WRITES. + * Fixed missing EXTRA_DIST in tests. Extended README for releasing. + +------------------------------------------------------------------- Old: ---- xauth-1.0.8.tar.bz2 New: ---- xauth-1.0.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xauth.spec ++++++ --- /var/tmp/diff_new_pack.sC2oXz/_old 2014-05-10 08:32:03.000000000 +0200 +++ /var/tmp/diff_new_pack.sC2oXz/_new 2014-05-10 08:32:03.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xauth # -# 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 @@ -17,7 +17,7 @@ Name: xauth -Version: 1.0.8 +Version: 1.0.9 Release: 0 Summary: Utility to edit and display the X authorization information License: MIT @@ -55,7 +55,6 @@ %defattr(-,root,root) %doc ChangeLog COPYING README %{_bindir}/xauth -%{_bindir}/test_xauth %{_mandir}/man1/xauth.1%{?ext_man} %changelog ++++++ xauth-1.0.8.tar.bz2 -> xauth-1.0.9.tar.bz2 ++++++ ++++ 5581 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/ChangeLog new/xauth-1.0.9/ChangeLog --- old/xauth-1.0.8/ChangeLog 2013-10-11 20:57:36.000000000 +0200 +++ new/xauth-1.0.9/ChangeLog 2014-04-02 20:26:56.000000000 +0200 @@ -1,3 +1,84 @@ +commit 0b120e37be8ed44188b3497bf02db48e9cf638bc +Author: Dr. Tilmann Bubeck <tilmann(a)bubecks.de> +Date: Wed Apr 2 20:02:00 2014 +0200 + + Third version bump to 1.0.9. + + Minor change in README to include 1.0.9 in diff so that release.sh + is happy. + + Signed-off-by: Dr. Tilmann Bubeck <tilmann(a)bubecks.de> + +commit e204395a7ccf403999ffa2515379784b641745d1 +Author: Dr. Tilmann Bubeck <tilmann(a)bubecks.de> +Date: Wed Apr 2 19:52:43 2014 +0200 + + Second version bump to 1.0.9. + + Minor change in README to push the version bump. + + Signed-off-by: Dr. Tilmann Bubeck <tilmann(a)bubecks.de> + +commit c36e9838294a6042eb7ae61fc476cbc3280aef2d +Author: Dr. Tilmann Bubeck <tilmann(a)bubecks.de> +Date: Wed Apr 2 19:44:37 2014 +0200 + + Fixed missing EXTRA_DIST in tests. Extended README for releasing. + + The tests/Makefile.am missed the EXTRA_DIST definition which resulted in + missing files for the test done with "make check". This was fixed. + README was extended to describe howto release a new version of this + software and to clarify something from ReleaseHOWTO of x.org. + Prepare anything for releasing 1.0.9. + + Signed-off-by: Dr. Tilmann Bubeck <tilmann(a)bubecks.de> + +commit ce4bfd951160eabdb28f5534c34aa7549dba7fba +Author: Dr. Tilmann Bubeck <t.bubeck(a)reinform.de> +Date: Mon Mar 31 23:21:12 2014 +0200 + + version bump to 1.0.9 + + Prepare for a new version 1.0.9 of xauth. + + Signed-off-by: Dr. Tilmann Bubeck <t.bubeck(a)reinform.de> + +commit ccf30deb585297823ea03fc68805a1c825e335fe +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Dec 27 11:01:35 2013 -0800 + + Add AC_USE_SYSTEM_EXTENSIONS to expose non-standard extensions + + Required on Solaris to expose definitions in system headers that + are not defined in the XPG standards now that xtrans 1.3 defines + _XOPEN_SOURCE to 600 on Solaris. + + Fixes build failures: + gethost.c: In function ‘get_hostname’: + gethost.c:97:21: error: ‘INET6_ADDRSTRLEN’ undeclared (first use in this function) + gethost.c:97:21: note: each undeclared identifier is reported only once for each function it appears in + gethost.c:97:16: warning: unused variable ‘addr’ [-Wunused-variable] + gethost.c: In function ‘get_address_info’: + gethost.c:196:9: error: implicit declaration of function ‘strlcpy’ [-Werror=implicit-function-declaration] + gethost.c:196:9: warning: nested extern declaration of ‘strlcpy’ [-Wnested-externs] + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Daniel Stone <daniel(a)fooishbar.org> + +commit afeb2c22ba1f7193acf814954e66f40cfd699c17 +Author: Dr. Tilmann Bubeck <t.bubeck(a)reinform.de> +Date: Sun Oct 13 21:38:10 2013 +0200 + + Fix warning about warn_unused_result triggered by WRITES. + +commit 2eb4ef59d7c27ac7972954d406ad9c2fa8123672 +Author: Dr. Tilmann Bubeck <t.bubeck(a)reinform.de> +Date: Sun Oct 13 17:57:49 2013 +0200 + + * Do not install test_xauth during "make install" as it is + only used during "make check". + * perror out, if test_xauth does not find "cmdtest". + commit 4de4a231f3a718d2af0d2b00443c803f8bddfbc5 Author: Dr. Tilmann Bubeck <t.bubeck(a)reinform.de> Date: Wed Oct 9 23:45:15 2013 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/README new/xauth-1.0.9/README --- old/xauth-1.0.8/README 2013-10-08 21:42:19.000000000 +0200 +++ new/xauth-1.0.9/README 2014-04-02 20:02:59.000000000 +0200 @@ -38,3 +38,37 @@ http://wiki.x.org/wiki/GitPage + + IV. RELEASING + +This section describes how to release a new version of xauth to the +public. A detailed description of this process can be found at +http://www.x.org/wiki/Development/Documentation/ReleaseHOWTO with a +few clarification below. + +For releasing under Fedora make sure, that INSTALL in +/usr/share/util-macros/ exists. If not, then please create that +file. + +To release a new version of xauth, please follow this steps: + + * git clone git://anongit.freedesktop.org/git/xorg/app/xauth + * cd xauth ; ./autogen.sh ; make ; make check + * follow ReleaseHowto inside this directory. + +Ignore these errors shown during release.sh: + + /bin/sh: ../.changelog.tmp: Permission denied + git directory not found: installing possibly empty changelog. + + cp: cannot create regular file '../.INSTALL.tmp': Permission denied + util-macros "pkgdatadir" from xorg-macros.pc not found: installing possibly empty INSTALL. + + V. GARBAGE + +Please ignore this paragraph. It is only used to satisfying +release.sh, which wants to see the version number to the last version +in the diff, which is 1.0.9 in our case. This paragraph can be +deleted on the next release of xauth. + +[eof] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/config.h.in new/xauth-1.0.9/config.h.in --- old/xauth-1.0.8/config.h.in 2013-10-10 23:30:18.000000000 +0200 +++ new/xauth-1.0.9/config.h.in 2014-04-02 20:03:02.000000000 +0200 @@ -78,9 +78,6 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL -/* Define as the return type of signal handlers (`int' or `void'). */ -#undef RETSIGTYPE - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS @@ -90,5 +87,40 @@ /* Support UNIX socket connections */ #undef UNIXCONN +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + + /* Version number of package */ #undef VERSION + +/* Define to 1 if on MINIX. */ +#undef _MINIX + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +#undef _POSIX_1_SOURCE + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +#undef _POSIX_SOURCE + +/* Defined if needed to expose struct msghdr.msg_control */ +#undef _XOPEN_SOURCE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/configure.ac new/xauth-1.0.9/configure.ac --- old/xauth-1.0.8/configure.ac 2013-10-09 23:27:38.000000000 +0200 +++ new/xauth-1.0.9/configure.ac 2014-04-02 20:02:59.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ([2.60]) AC_INIT([xauth], - [1.0.8], + [1.0.9], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xauth]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) @@ -30,6 +30,11 @@ AC_CONFIG_HEADERS([config.h]) +# Set common system defines for POSIX extensions, such as _GNU_SOURCE +# Must be called before any macros that run the compiler (like +# AC_PROG_LIBTOOL) to avoid autoconf errors. +AC_USE_SYSTEM_EXTENSIONS + # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/missing new/xauth-1.0.9/missing --- old/xauth-1.0.8/missing 2013-10-10 23:30:19.000000000 +0200 +++ new/xauth-1.0.9/missing 2014-04-02 20:03:02.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.18; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,61 +29,33 @@ exit 1 fi -run=: -sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' -sed_minuso='s/.* -o $[^ ]*$.*/\1/p' - -# In the cases where this matters, 'missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file 'aclocal.m4' - autoconf touch file 'configure' - autoheader touch file 'config.h.in' - autom4te touch the output file, or create a stub one - automake touch all 'Makefile.in' files - bison create 'y.tab.[ch]', if possible, from existing .[ch] - flex create 'lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create 'lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create 'y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and 'g' are ignored when checking the name. @@ -98,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "$0: unknown '$1' option" echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running '$TOOL --version' or '$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acinclude.m4' or '${configure_ac}'. You might want - to install the Automake and Perl packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified '${configure_ac}'. You might want to install the - Autoconf and GNU m4 packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acconfig.h' or '${configure_ac}'. You might want - to install the Autoconf and GNU m4 packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. - You might want to install the Automake and Perl packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: '$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get '$1' as part of Autoconf from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: '$1' $msg. You should only need it if - you modified a '.y' file. You may need the Bison package - in order for those modifications to take effect. You can get - Bison from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.l' file. You may need the Flex package - in order for those modifications to take effect. You can get - Flex from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - Help2man package in order for those modifications to take - effect. You can get Help2man from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.texi' or '.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy 'make' (AIX, - DU, IRIX). You might want to install the Texinfo package or - the GNU make package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* $[^ ]*$ *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: '$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the 'README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing '$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/process.c new/xauth-1.0.9/process.c --- old/xauth-1.0.8/process.c 2013-10-08 21:42:19.000000000 +0200 +++ new/xauth-1.0.9/process.c 2014-04-02 20:02:59.000000000 +0200 @@ -636,8 +636,9 @@ static volatile Bool dieing = False; -/* poor man's puts(), for under signal handlers */ -#define WRITES(fd, S) (void)write((fd), (S), strlen((S))) +/* poor man's puts(), for under signal handlers, + extended to ignore warn_unused_result */ +#define WRITES(fd, S) {if(write((fd), (S), strlen((S))));} /* ARGSUSED */ _X_NORETURN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/test-driver new/xauth-1.0.9/test-driver --- old/xauth-1.0.8/test-driver 1970-01-01 01:00:00.000000000 +0100 +++ new/xauth-1.0.9/test-driver 2014-04-02 20:03:02.000000000 +0200 @@ -0,0 +1,127 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2012-06-27.10; # UTC + +# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-automake(a)gnu.org> or send patches to +# <automake-patches(a)gnu.org>. + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <<END +Usage: + test-driver --test-name=NAME --log-file=PATH --trs-file=PATH + [--expect-failure={yes|no}] [--color-tests={yes|no}] + [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT +The '--test-name', '--log-file' and '--trs-file' options are mandatory. +END +} + +# TODO: better error handling in option parsing (in particular, ensure +# TODO: $log_file, $trs_file and $test_name are defined). +test_name= # Used for reporting. +log_file= # Where to save the output of the test script. +trs_file= # Where to save the metadata of the test run. +expect_failure=no +color_tests=no +enable_hard_errors=yes +while test $# -gt 0; do + case $1 in + --help) print_usage; exit $?;; + --version) echo "test-driver $scriptversion"; exit $?;; + --test-name) test_name=$2; shift;; + --log-file) log_file=$2; shift;; + --trs-file) trs_file=$2; shift;; + --color-tests) color_tests=$2; shift;; + --expect-failure) expect_failure=$2; shift;; + --enable-hard-errors) enable_hard_errors=$2; shift;; + --) shift; break;; + -*) usage_error "invalid option: '$1'";; + esac + shift +done + +if test $color_tests = yes; then + # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. + red='[0;31m' # Red. + grn='[0;32m' # Green. + lgn='[1;32m' # Light green. + blu='[1;34m' # Blue. + mgn='[0;35m' # Magenta. + std='[m' # No color. +else + red= grn= lgn= blu= mgn= std= +fi + +do_exit='rm -f $log_file $trs_file; (exit $st); exit $st' +trap "st=129; $do_exit" 1 +trap "st=130; $do_exit" 2 +trap "st=141; $do_exit" 13 +trap "st=143; $do_exit" 15 + +# Test script is run here. +"$@" >$log_file 2>&1 +estatus=$? +if test $enable_hard_errors = no && test $estatus -eq 99; then + estatus=1 +fi + +case $estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/tests/010-xauth-add-inet.script new/xauth-1.0.9/tests/010-xauth-add-inet.script --- old/xauth-1.0.8/tests/010-xauth-add-inet.script 1970-01-01 01:00:00.000000000 +0100 +++ new/xauth-1.0.9/tests/010-xauth-add-inet.script 2014-04-02 20:02:59.000000000 +0200 @@ -0,0 +1,20 @@ +#!/bin/bash + +# setup the test ennvironment inside this shell +. setup-sourced + +xauth add examplehost1/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000001 +xauth add examplehost2/unix:0 . b90b0fd1cf6a0e7a2c74c00000000002 +xauth add examplehost3/unix:0 . b90b0fd1cf6a0e7a2c74c00000000003 + +xauth list +xauth nlist +xauth list examplehost1/unix:0 +xauth nlist examplehost2/unix:0 + +xauth remove examplehost1/unix:0 +xauth list +xauth remove examplehost2/unix:0 +xauth remove examplehost3/unix:0 +xauth list + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/tests/010-xauth-add-inet.stdout new/xauth-1.0.9/tests/010-xauth-add-inet.stdout --- old/xauth-1.0.8/tests/010-xauth-add-inet.stdout 1970-01-01 01:00:00.000000000 +0100 +++ new/xauth-1.0.9/tests/010-xauth-add-inet.stdout 2014-04-02 20:02:59.000000000 +0200 @@ -0,0 +1,34 @@ +> xauth add examplehost1/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000001 + exits with 0 +> xauth add examplehost2/unix:0 . b90b0fd1cf6a0e7a2c74c00000000002 + exits with 0 +> xauth add examplehost3/unix:0 . b90b0fd1cf6a0e7a2c74c00000000003 + exits with 0 +> xauth list +examplehost1/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000001 +examplehost2/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000002 +examplehost3/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000003 + exits with 0 +> xauth nlist +0100 000c 6578616d706c65686f737431 0001 30 0012 4d49542d4d414749432d434f4f4b49452d31 0010 b90b0fd1cf6a0e7a2c74c00000000001 +0100 000c 6578616d706c65686f737432 0001 30 0012 4d49542d4d414749432d434f4f4b49452d31 0010 b90b0fd1cf6a0e7a2c74c00000000002 +0100 000c 6578616d706c65686f737433 0001 30 0012 4d49542d4d414749432d434f4f4b49452d31 0010 b90b0fd1cf6a0e7a2c74c00000000003 + exits with 0 +> xauth list examplehost1/unix:0 +examplehost1/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000001 + exits with 0 +> xauth nlist examplehost2/unix:0 +0100 000c 6578616d706c65686f737432 0001 30 0012 4d49542d4d414749432d434f4f4b49452d31 0010 b90b0fd1cf6a0e7a2c74c00000000002 + exits with 0 +> xauth remove examplehost1/unix:0 + exits with 0 +> xauth list +examplehost2/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000002 +examplehost3/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000003 + exits with 0 +> xauth remove examplehost2/unix:0 + exits with 0 +> xauth remove examplehost3/unix:0 + exits with 0 +> xauth list + exits with 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/tests/020-xauth-add-local.script new/xauth-1.0.9/tests/020-xauth-add-local.script --- old/xauth-1.0.8/tests/020-xauth-add-local.script 1970-01-01 01:00:00.000000000 +0100 +++ new/xauth-1.0.9/tests/020-xauth-add-local.script 2014-04-02 20:02:59.000000000 +0200 @@ -0,0 +1,22 @@ +#!/bin/bash + +# setup the test ennvironment inside this shell +. setup-sourced + +# Execute the test +xauth add unix:0 . b90b0fd1cf6a0e7a2c74c00000000004 +xauth add 127.0.0.1:1 . b90b0fd1cf6a0e7a2c74c00000000005 +xauth add :2 . b90b0fd1cf6a0e7a2c74c00000000006 +xauth add :3.5 . b90b0fd1cf6a0e7a2c74c00000000007 +xauth add :4 . b90b0fd1cf6a0e7a2c74c00000000004 + +# List the number of entries added +xauth list | wc -l + +# Try to match them and print cookie +xauth list unix:0 | awk '{print $3}' +xauth list 127.0.0.1:1 | awk '{print $3}' +xauth list 127.0.0.1:2 | awk '{print $3}' +xauth list 127.0.0.1:3.6 | awk '{print $3}' +xauth list :4 | awk '{print $3}' + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/tests/020-xauth-add-local.stdout new/xauth-1.0.9/tests/020-xauth-add-local.stdout --- old/xauth-1.0.8/tests/020-xauth-add-local.stdout 1970-01-01 01:00:00.000000000 +0100 +++ new/xauth-1.0.9/tests/020-xauth-add-local.stdout 2014-04-02 20:02:59.000000000 +0200 @@ -0,0 +1,26 @@ +> xauth add unix:0 . b90b0fd1cf6a0e7a2c74c00000000004 + exits with 0 +> xauth add 127.0.0.1:1 . b90b0fd1cf6a0e7a2c74c00000000005 + exits with 0 +> xauth add :2 . b90b0fd1cf6a0e7a2c74c00000000006 + exits with 0 +> xauth add :3.5 . b90b0fd1cf6a0e7a2c74c00000000007 + exits with 0 +> xauth add :4 . b90b0fd1cf6a0e7a2c74c00000000004 + exits with 0 +7 +list +b90b0fd1cf6a0e7a2c74c00000000004 +0 +list +b90b0fd1cf6a0e7a2c74c00000000005 +0 +list +b90b0fd1cf6a0e7a2c74c00000000006 +0 +list +b90b0fd1cf6a0e7a2c74c00000000007 +0 +list +b90b0fd1cf6a0e7a2c74c00000000004 +0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/tests/030-xauth-extract.script new/xauth-1.0.9/tests/030-xauth-extract.script --- old/xauth-1.0.8/tests/030-xauth-extract.script 1970-01-01 01:00:00.000000000 +0100 +++ new/xauth-1.0.9/tests/030-xauth-extract.script 2014-04-02 20:02:59.000000000 +0200 @@ -0,0 +1,26 @@ +#!/bin/bash + +# setup the test ennvironment inside this shell +. setup-sourced + +# Execute the test +xauth add examplehost1/unix:0 . b90b0fd1cf6a0e7a2c74c00000000001 +xauth add examplehost2/unix:0 . b90b0fd1cf6a0e7a2c74c00000000002 +xauth add examplehost3/unix:0 . b90b0fd1cf6a0e7a2c74c00000000003 + +# Use xauth_silent because otherwise the system dependant pathes are printed +XAUTHORITY2=$DATADIR/.Xauthority2 +xauth_silent extract $XAUTHORITY2 examplehost2/unix:0 +xauth_silent -f $XAUTHORITY2 list + +XAUTHORITY3=$DATADIR/.Xauthority3 +xauth_silent extract $XAUTHORITY3 examplehost3/unix:0 +xauth_silent -f $XAUTHORITY3 list + +rm $XAUTHORITY ; touch $XAUTHORITY +xauth_silent merge $XAUTHORITY2 $XAUTHORITY3 +xauth list + + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/tests/030-xauth-extract.stdout new/xauth-1.0.9/tests/030-xauth-extract.stdout --- old/xauth-1.0.8/tests/030-xauth-extract.stdout 1970-01-01 01:00:00.000000000 +0100 +++ new/xauth-1.0.9/tests/030-xauth-extract.stdout 2014-04-02 20:02:59.000000000 +0200 @@ -0,0 +1,22 @@ +> xauth add examplehost1/unix:0 . b90b0fd1cf6a0e7a2c74c00000000001 + exits with 0 +> xauth add examplehost2/unix:0 . b90b0fd1cf6a0e7a2c74c00000000002 + exits with 0 +> xauth add examplehost3/unix:0 . b90b0fd1cf6a0e7a2c74c00000000003 + exits with 0 +> xauth some silent commands which should not be logged... + exits with 0 +> xauth some silent commands which should not be logged... +examplehost2/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000002 + exits with 0 +> xauth some silent commands which should not be logged... + exits with 0 +> xauth some silent commands which should not be logged... +examplehost3/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000003 + exits with 0 +> xauth some silent commands which should not be logged... + exits with 0 +> xauth list +examplehost2/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000002 +examplehost3/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000003 + exits with 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/tests/040-xauth-source.script new/xauth-1.0.9/tests/040-xauth-source.script --- old/xauth-1.0.8/tests/040-xauth-source.script 1970-01-01 01:00:00.000000000 +0100 +++ new/xauth-1.0.9/tests/040-xauth-source.script 2014-04-02 20:02:59.000000000 +0200 @@ -0,0 +1,10 @@ +#!/bin/bash + +# setup the test ennvironment inside this shell +. setup-sourced + +# Execute the test +CMDFILE=$DATADIR/xauth-cmdfile +echo add examplehost1/unix:0 . b90b0fd1cf6a0e7a2c74c00000000001 > $CMDFILE +xauth_silent source $CMDFILE +xauth list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/tests/040-xauth-source.stdout new/xauth-1.0.9/tests/040-xauth-source.stdout --- old/xauth-1.0.8/tests/040-xauth-source.stdout 1970-01-01 01:00:00.000000000 +0100 +++ new/xauth-1.0.9/tests/040-xauth-source.stdout 2014-04-02 20:02:59.000000000 +0200 @@ -0,0 +1,5 @@ +> xauth some silent commands which should not be logged... + exits with 0 +> xauth list +examplehost1/unix:0 MIT-MAGIC-COOKIE-1 b90b0fd1cf6a0e7a2c74c00000000001 + exits with 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/tests/090-xauth-bad-usage.script new/xauth-1.0.9/tests/090-xauth-bad-usage.script --- old/xauth-1.0.8/tests/090-xauth-bad-usage.script 1970-01-01 01:00:00.000000000 +0100 +++ new/xauth-1.0.9/tests/090-xauth-bad-usage.script 2014-04-02 20:02:59.000000000 +0200 @@ -0,0 +1,17 @@ +#!/bin/bash + +# setup the test ennvironment inside this shell +. setup-sourced + +# Execute the test + +# The following displays are bad: +xauth add bad4/unix:0 . b90b0fd1cf6a0e7a2c74c0000000002 +xauth add bad4/unix:0 . ThisIsNotHex0e7a2c74c00000000011 +xauth add bad4/unxi:0 . b90b0fd1cf6a0e7a2c74c00000000021 +xauth add bad5/unix: . b90b0fd1cf6a0e7a2c74c00000000022 +xauth add bad6/something/unix:0 . b90b0fd1cf6a0e7a2c74c00000000023 +xauth add bad7/unix . b90b0fd1cf6a0e7a2c74c00000000024 +xauth add bad8 . b90b0fd1cf6a0e7a2c74c00000000025 +xauth add 127.0.0.:0 . b90b0fd1cf6a0e7a2c74c00000000026 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/tests/090-xauth-bad-usage.stderr new/xauth-1.0.9/tests/090-xauth-bad-usage.stderr --- old/xauth-1.0.8/tests/090-xauth-bad-usage.stderr 1970-01-01 01:00:00.000000000 +0100 +++ new/xauth-1.0.9/tests/090-xauth-bad-usage.stderr 2014-04-02 20:02:59.000000000 +0200 @@ -0,0 +1,8 @@ +../xauth: (argv):1: key contains odd number of or non-hex characters +../xauth: (argv):1: key contains odd number of or non-hex characters +../xauth: (argv):1: bad display name "bad4/unxi:0" in "add" command +../xauth: (argv):1: bad display name "bad5/unix:" in "add" command +../xauth: (argv):1: bad display name "bad6/something/unix:0" in "add" command +../xauth: (argv):1: bad display name "bad7/unix" in "add" command +../xauth: (argv):1: bad display name "bad8" in "add" command +../xauth: (argv):1: bad display name "127.0.0.:0" in "add" command diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/tests/090-xauth-bad-usage.stdout new/xauth-1.0.9/tests/090-xauth-bad-usage.stdout --- old/xauth-1.0.8/tests/090-xauth-bad-usage.stdout 1970-01-01 01:00:00.000000000 +0100 +++ new/xauth-1.0.9/tests/090-xauth-bad-usage.stdout 2014-04-02 20:02:59.000000000 +0200 @@ -0,0 +1,16 @@ +> xauth add bad4/unix:0 . b90b0fd1cf6a0e7a2c74c0000000002 + exits with 1 +> xauth add bad4/unix:0 . ThisIsNotHex0e7a2c74c00000000011 + exits with 1 +> xauth add bad4/unxi:0 . b90b0fd1cf6a0e7a2c74c00000000021 + exits with 1 +> xauth add bad5/unix: . b90b0fd1cf6a0e7a2c74c00000000022 + exits with 1 +> xauth add bad6/something/unix:0 . b90b0fd1cf6a0e7a2c74c00000000023 + exits with 1 +> xauth add bad7/unix . b90b0fd1cf6a0e7a2c74c00000000024 + exits with 1 +> xauth add bad8 . b90b0fd1cf6a0e7a2c74c00000000025 + exits with 1 +> xauth add 127.0.0.:0 . b90b0fd1cf6a0e7a2c74c00000000026 + exits with 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/tests/Makefile.am new/xauth-1.0.9/tests/Makefile.am --- old/xauth-1.0.8/tests/Makefile.am 2013-10-10 23:29:31.000000000 +0200 +++ new/xauth-1.0.9/tests/Makefile.am 2014-04-02 20:02:59.000000000 +0200 @@ -1,7 +1,14 @@ ## Process this file with automake to produce Makefile.in +EXTRA_DIST = setup-sourced \ + 010-xauth-add-inet.script 010-xauth-add-inet.stdout \ + 020-xauth-add-local.script 020-xauth-add-local.stdout \ + 030-xauth-extract.script 030-xauth-extract.stdout \ + 040-xauth-source.script 040-xauth-source.stdout \ + 090-xauth-bad-usage.script 090-xauth-bad-usage.stderr 090-xauth-bad-usage.stdout + TESTS = test_xauth -bin_PROGRAMS = test_xauth +check_PROGRAMS = test_xauth test_xauth_SOURCES = test_xauth.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/tests/setup-sourced new/xauth-1.0.9/tests/setup-sourced --- old/xauth-1.0.8/tests/setup-sourced 1970-01-01 01:00:00.000000000 +0100 +++ new/xauth-1.0.9/tests/setup-sourced 2014-04-02 20:02:59.000000000 +0200 @@ -0,0 +1,26 @@ +# +# This script gets sourced by every test to setup a common environment. +# + +# Force all output to be standard english +export LANG=C + +# Define the name of the authority file, which we use during test. +export XAUTHORITY=${DATADIR:-/tmp}/.Xauthority + +# Start a new authority file +rm -f $XAUTHORITY ; touch $XAUTHORITY + +function xauth() +{ + echo "> xauth" "$@" + ../xauth "$@" + echo " exits with $?" +} + +function xauth_silent() +{ + echo "> xauth" "some silent commands which should not be logged..." + ../xauth "$@" + echo " exits with $?" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.8/tests/test_xauth.c new/xauth-1.0.9/tests/test_xauth.c --- old/xauth-1.0.8/tests/test_xauth.c 2013-10-10 23:29:31.000000000 +0200 +++ new/xauth-1.0.9/tests/test_xauth.c 2014-04-02 20:02:59.000000000 +0200 @@ -1,6 +1,10 @@ +#include <stdio.h> +#include <stdlib.h> #include <unistd.h> int main(int argc, char *argv[]) { execlp("cmdtest", "cmdtest", ".", NULL); + perror("Unable to execute 'cmdtest'. Make sure, that it is installed"); + exit(1); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xf86-video-vmware for openSUSE:Factory
by root＠hilbert.suse.de 10 May '14

10 May '14

Hello community, here is the log from the commit of package xf86-video-vmware for openSUSE:Factory checked in at 2014-05-10 08:31:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-vmware (Old) and /work/SRC/openSUSE:Factory/.xf86-video-vmware.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-video-vmware" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-vmware/xf86-video-vmware.changes 2014-03-22 19:46:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-video-vmware.new/xf86-video-vmware.changes 2014-05-10 08:32:01.000000000 +0200 @@ -1,0 +2,8 @@ +Wed May 7 09:55:35 UTC 2014 - sndirsch(a)suse.com + +- update to release 13.0.2 + * This release contains support for both XMir and XWayland, + updated support for the new XA version released with the + new Mesa 10.1 version. + +------------------------------------------------------------------- Old: ---- xf86-video-vmware-13.0.1-51cdfa6.tar.bz2 New: ---- xf86-video-vmware-13.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-vmware.spec ++++++ --- /var/tmp/diff_new_pack.wP9gqV/_old 2014-05-10 08:32:01.000000000 +0200 +++ /var/tmp/diff_new_pack.wP9gqV/_new 2014-05-10 08:32:01.000000000 +0200 @@ -17,14 +17,14 @@ Name: xf86-video-vmware -Version: 13.0.1 +Version: 13.0.2 Release: 0 Summary: VMware SVGA video driver for the Xorg X server License: MIT Group: System/X11/Servers/XF86_4 Url: http://xorg.freedesktop.org/ #http://xorg.freedesktop.org/releases/individual/driver/ -Source0: %{name}-%{version}-51cdfa6.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 ExclusiveArch: %ix86 x86_64 BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) ++++++ xf86-video-vmware-13.0.1-51cdfa6.tar.bz2 -> xf86-video-vmware-13.0.2.tar.bz2 ++++++ ++++ 9062 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-vmware-13.0.1/ChangeLog new/xf86-video-vmware-13.0.2/ChangeLog --- old/xf86-video-vmware-13.0.1/ChangeLog 2014-03-19 18:12:36.000000000 +0100 +++ new/xf86-video-vmware-13.0.2/ChangeLog 2014-03-26 13:17:30.000000000 +0100 @@ -1,3 +1,11 @@ +commit cbd56b3759f01ec18ae0705d023e4c0b2ab38c25 +Author: Jakob Bornecrantz <jakob(a)vmware.com> +Date: Wed Mar 26 12:45:52 2014 +0100 + + Bump the version number to 13.0.2 + + Signed-off-by: Jakob Bornecrantz <jakob(a)vmware.com> + commit 51cdfa6f5102bde92c98630ace6650e4b286f6e2 Author: Jakob Bornecrantz <jakob(a)vmware.com> Date: Fri Feb 21 18:10:07 2014 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-vmware-13.0.1/INSTALL new/xf86-video-vmware-13.0.2/INSTALL --- old/xf86-video-vmware-13.0.1/INSTALL 2014-03-19 18:12:36.000000000 +0100 +++ new/xf86-video-vmware-13.0.2/INSTALL 2014-03-26 13:17:30.000000000 +0100 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-vmware-13.0.1/compile new/xf86-video-vmware-13.0.2/compile --- old/xf86-video-vmware-13.0.1/compile 2012-09-17 11:16:52.000000000 +0200 +++ new/xf86-video-vmware-13.0.2/compile 2014-03-26 13:03:46.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. +# Wrapper for compilers which do not understand '-c -o'. -scriptversion=2009-10-06.20; # UTC +scriptversion=2012-01-04.17; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free +# Software Foundation, Inc. # Written by Tom Tromey <tromey(a)cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -29,21 +29,186 @@ # bugs to <bug-automake(a)gnu.org> or send patches to # <automake-patches(a)gnu.org>. +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l*) + lib=${1#-l} + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + set x "$@" "$dir/$lib.dll.lib" + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + set x "$@" "$dir/$lib.lib" + break + fi + done + IFS=$save_IFS + + test "$found" != yes && set x "$@" "$lib.lib" + shift + ;; + -L*) + func_file_conv "${1#-L}" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to <bug-automake(a)gnu.org>. EOF @@ -53,11 +218,13 @@ echo "compile $scriptversion" exit $? ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; esac ofile= cfile= -eat= for arg do @@ -66,8 +233,8 @@ else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -94,10 +261,10 @@ done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # If no '-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -106,7 +273,7 @@ cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use '[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-vmware-13.0.1/config.h.in new/xf86-video-vmware-13.0.2/config.h.in --- old/xf86-video-vmware-13.0.1/config.h.in 2014-03-19 18:09:24.000000000 +0100 +++ new/xf86-video-vmware-13.0.2/config.h.in 2014-03-26 13:03:45.000000000 +0100 @@ -99,11 +99,6 @@ /* Version number of package */ #undef VERSION -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-vmware-13.0.1/configure.ac new/xf86-video-vmware-13.0.2/configure.ac --- old/xf86-video-vmware-13.0.1/configure.ac 2014-03-19 18:07:51.000000000 +0100 +++ new/xf86-video-vmware-13.0.2/configure.ac 2014-03-26 12:44:54.000000000 +0100 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-vmware], - [13.0.1], + [13.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xf86-video-vmware]) AC_CONFIG_SRCDIR([Makefile.am]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-vmware-13.0.1/missing new/xf86-video-vmware-13.0.2/missing --- old/xf86-video-vmware-13.0.1/missing 2008-01-19 18:21:36.000000000 +0100 +++ new/xf86-video-vmware-13.0.2/missing 2014-03-26 13:03:46.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2012-01-06.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -86,9 +84,11 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,23 +106,21 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -138,7 +136,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +146,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +155,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +185,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +208,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -218,7 +216,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -240,7 +238,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -248,7 +246,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -263,7 +261,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +275,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,41 +308,6 @@ touch $file ;; - tar) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. @@ -363,5 +326,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0