September 2014 - openSUSE Commits - openSUSE Mailing Lists

commit perl-Bootloader for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at 2014-09-28 19:58:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old) and /work/SRC/openSUSE:Factory/.perl-Bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes 2014-09-17 21:23:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new/perl-Bootloader.changes 2014-09-28 19:58:59.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Sep 26 13:14:57 CEST 2014 - snwint(a)suse.de + +- fix GRUB_TERMINAL check to accept multiple terminal devices (bsc #898609) +- 0.824 + +------------------------------------------------------------------- +Fri Sep 26 10:56:10 CEST 2014 - snwint(a)suse.de + +- write only files we have data for (bsc #898429) +- 0.823 + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.822.tar.xz New: ---- perl-Bootloader-0.824.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.yvPS1z/_old 2014-09-28 19:59:00.000000000 +0200 +++ /var/tmp/diff_new_pack.yvPS1z/_new 2014-09-28 19:59:00.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Bootloader -Version: 0.822 +Version: 0.824 Release: 0 Requires: coreutils Requires: perl-base = %{perl_version} ++++++ perl-Bootloader-0.822.tar.xz -> perl-Bootloader-0.824.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.822/perl-Bootloader.changes new/perl-Bootloader-0.824/perl-Bootloader.changes --- old/perl-Bootloader-0.822/perl-Bootloader.changes 2014-09-16 10:50:53.000000000 +0200 +++ new/perl-Bootloader-0.824/perl-Bootloader.changes 2014-09-26 13:26:16.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Fri Sep 26 13:14:57 CEST 2014 - snwint(a)suse.de + +- fix GRUB_TERMINAL check to accept multiple terminal devices (bsc #898609) +- 0.824 + +------------------------------------------------------------------- +Fri Sep 26 10:56:10 CEST 2014 - snwint(a)suse.de + +- write only files we have data for (bsc #898429) +- 0.823 + +------------------------------------------------------------------- Tue Sep 16 10:36:10 CEST 2014 - snwint(a)suse.de - join byid and kern maps instead of picking one (bnc #896665) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.822/src/Core/GRUB2.pm new/perl-Bootloader-0.824/src/Core/GRUB2.pm --- old/perl-Bootloader-0.822/src/Core/GRUB2.pm 2014-09-16 10:50:53.000000000 +0200 +++ new/perl-Bootloader-0.824/src/Core/GRUB2.pm 2014-09-26 13:26:16.000000000 +0200 @@ -795,7 +795,8 @@ } elsif ($key =~ m/@?GRUB_HIDDEN_TIMEOUT$/) { $hidden_timeout = $val; } elsif ($key =~ m/@?GRUB_TERMINAL/) { - if ($val =~ m/^(serial|console|gfxterm)$/) { + # GRUB_TERMINAL is a space separated list of terminal devices to use + if ($val =~ m/^(\b(serial|console|gfxterm)\b|\s+)*$/) { $ret{"terminal"} = $val; } } elsif ($key =~ m/@?GRUB_SERIAL_COMMAND/) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.822/src/Core/GRUB2EFI.pm new/perl-Bootloader-0.824/src/Core/GRUB2EFI.pm --- old/perl-Bootloader-0.822/src/Core/GRUB2EFI.pm 2014-09-16 10:50:53.000000000 +0200 +++ new/perl-Bootloader-0.824/src/Core/GRUB2EFI.pm 2014-09-26 13:26:16.000000000 +0200 @@ -379,7 +379,8 @@ } elsif ($key =~ m/@?GRUB_HIDDEN_TIMEOUT$/) { $hidden_timeout = $val; } elsif ($key =~ m/@?GRUB_TERMINAL/) { - if ($val =~ m/^(serial|console|gfxterm)$/) { + # GRUB_TERMINAL is a space separated list of terminal devices to use + if ($val =~ m/^(\b(serial|console|gfxterm)\b|\s+)*$/) { $ret{"terminal"} = $val; } } elsif ($key =~ m/@?GRUB_SERIAL_COMMAND/) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.822/src/Core.pm new/perl-Bootloader-0.824/src/Core.pm --- old/perl-Bootloader-0.822/src/Core.pm 2014-09-16 10:50:53.000000000 +0200 +++ new/perl-Bootloader-0.824/src/Core.pm 2014-09-26 13:26:16.000000000 +0200 @@ -839,7 +839,9 @@ my $files2write = $menu_only ? $self->ListMenuFiles() : [ sort keys %$files ]; - $ok &= $self->WriteFile($_ . $suffix, $files->{$_}) for @$files2write; + for (@$files2write) { + $ok &= $self->WriteFile($_ . $suffix, $files->{$_}) if exists $files->{$_}; + } return $ok; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.822/version new/perl-Bootloader-0.824/version --- old/perl-Bootloader-0.822/version 2014-09-16 10:50:53.000000000 +0200 +++ new/perl-Bootloader-0.824/version 2014-09-26 13:26:16.000000000 +0200 @@ -1 +1 @@ -0.822 +0.824 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit linuxrc for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2014-09-28 19:58:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "linuxrc" Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2014-09-19 13:55:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-09-28 19:58:58.000000000 +0200 @@ -1,0 +2,15 @@ +Fri Sep 26 11:09:37 CEST 2014 - snwint(a)suse.de + +- s390x: revert hypervisor check (bnc #887238) +- 5.0.23 + +------------------------------------------------------------------- +Wed Sep 24 08:28:54 CEST 2014 - snwint(a)suse.de + +- s390x: write LLADDR only on LPAR +- s390x: store MAC address for layer2 devices in ifcfg (bnc #887238) +- add 'archive' target to Makefile +- use improved git2log script +- 5.0.22 + +------------------------------------------------------------------- Old: ---- linuxrc-5.0.21.tar.xz New: ---- linuxrc-5.0.23.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.ZUWc74/_old 2014-09-28 19:58:58.000000000 +0200 +++ /var/tmp/diff_new_pack.ZUWc74/_new 2014-09-28 19:58:58.000000000 +0200 @@ -25,9 +25,9 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 5.0.21 +Version: 5.0.23 Release: 0 -Source: linuxrc-5.0.21.tar.xz +Source: linuxrc-5.0.23.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-5.0.21.tar.xz -> linuxrc-5.0.23.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.21/Makefile new/linuxrc-5.0.23/Makefile --- old/linuxrc-5.0.21/Makefile 2014-08-18 15:17:24.000000000 +0200 +++ new/linuxrc-5.0.23/Makefile 2014-09-23 13:21:51.000000000 +0200 @@ -2,7 +2,11 @@ CFLAGS = -c -g -O2 -Wall -Wno-pointer-sign LDFLAGS = -rdynamic -lhd -lblkid -lcurl -lreadline -GIT2LOG = $(shell [ -x ./git2log ] && echo ./git2log ) +GIT2LOG := $(shell if [ -x ./git2log ] ; then echo ./git2log --update ; else echo true ; fi) +GITDEPS := $(shell [ -d .git ] && echo .git/HEAD .git/refs/heads .git/refs/tags) +VERSION := $(shell $(GIT2LOG) --version VERSION ; cat VERSION) +BRANCH := $(shell git branch | perl -ne 'print $$_ if s/^\*\s*//') +PREFIX := linuxrc-$(VERSION) SRC = $(filter-out inflate.c,$(wildcard *.c)) INC = $(wildcard *.h) @@ -11,20 +15,15 @@ SUBDIRS = mkpsfu .EXPORT_ALL_VARIABLES: -.PHONY: all clean install libs +.PHONY: all clean install libs archive %.o: %.c $(CC) $(CFLAGS) -o $@ $< all: changelog libs linuxrc -ifneq ($(GIT2LOG),) -changelog: .git/HEAD .git/refs/heads .git/refs/tags - $(GIT2LOG) --log >changelog - -VERSION: .git/HEAD .git/refs/heads .git/refs/tags - $(GIT2LOG) --version >VERSION -endif +changelog: $(GITDEPS) + $(GIT2LOG) --changelog changelog version.h: VERSION @echo "#define LXRC_VERSION \"`cut -d. -f1-2 VERSION`\"" >$@ @@ -47,8 +46,15 @@ libs: @for d in $(SUBDIRS); do $(MAKE) -C $$d $(MAKECMDGOALS); done +archive: changelog + mkdir -p package + git archive --prefix=$(PREFIX)/ $(BRANCH) > package/$(PREFIX).tar + tar -r -f package/$(PREFIX).tar --mode=0664 --owner=root --group=root --mtime="`git show -s --format=%ci`" --transform='s:^:$(PREFIX)/:' VERSION changelog + xz -f package/$(PREFIX).tar + clean: libs rm -f $(OBJ) *~ linuxrc linuxrc.map linuxrc-debug .depend version.h + rm -rf package TAGS: *.c *.h */*.c */*.h etags *.c *.h */*.c */*.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.21/VERSION new/linuxrc-5.0.23/VERSION --- old/linuxrc-5.0.21/VERSION 2014-09-18 09:50:58.000000000 +0200 +++ new/linuxrc-5.0.23/VERSION 2014-09-26 11:09:18.000000000 +0200 @@ -1 +1 @@ -5.0.21 +5.0.23 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.21/changelog new/linuxrc-5.0.23/changelog --- old/linuxrc-5.0.21/changelog 2014-09-18 09:51:10.000000000 +0200 +++ new/linuxrc-5.0.23/changelog 2014-09-26 11:09:35.000000000 +0200 @@ -1,58 +1,41 @@ -2014-09-18: HEAD - - Merge pull request #31 from openSUSE/sw_0018 - - add sshkey option tp support ssh pubkey authentication (bnc #230781, bnc... +2014-09-26: 5.0.23 + - s390x: revert hypervisor check (bnc 887238) + +2014-09-23: 5.0.22 + - s390x: write LLADDR only on LPAR + - s390x: store MAC address for layer2 devices in ifcfg (bnc #887238) + - keep going without tags + - add 'archive' target to Makefile + - use improved git2log script + +2014-09-18: 5.0.21 - add sshkey option tp support ssh pubkey authentication (bnc #230781, bnc #421340) -2014-09-18: 5.0.20 - - Merge pull request #30 from openSUSE/sw_0017 - - make ifcfg=dhcp{4,6} work as expected +2014-09-17: 5.0.20 - make ifcfg=dhcp{4,6} work as expected 2014-09-17: 5.0.19 - - Merge pull request #29 from openSUSE/sw_0016 - - Sw 0016 - remove unnecessary check - don't check autoinst.xml digest (bnc #895670) - remove dead code 2014-09-15: 5.0.18 - - Merge pull request #28 from openSUSE/sw_0015 - - moved edd.ko loading into udev start script (bnc #871617) - moved edd.ko loading into udev start script (bnc #871617) - - We need to load more modules before starting udevd. Doing this in udev_setup - - now. See related change in installation-images. -2014-09-12: 5.0.17 - - Merge pull request #27 from openSUSE/sw_0014 - - finalize ifcfg option parsing +2014-09-11: 5.0.17 - finalize ifcfg option parsing -2014-09-11: 5.0.16 - - fix missing parameter to dia_input2() - - Merge pull request #26 from openSUSE/sw_0013 - - look for autoinst.xml and keep the name (don't use autoyast.xml internal... - - look for autoinst.xml and keep the name (don't use autoyast.xml internally; fate #316530) - - Merge pull request #25 from jsrain/master - - increased memory thrreshold for loading inst-sys to RAM (bnc #893982) +2014-08-29: 5.0.16 - increased memory thrreshold for loading inst-sys to RAM (bnc #893982) 2014-08-18: 5.0.15 - - Merge pull request #24 from openSUSE/sw_0012 - - Sw 0012 - clarify return code - add comment - s390x: don't resolve name of x11 server - fix nfs & cifs mounts (bnc #890172) - - We don't do dns lookups in linuxrc any longer. Adjusted code to no longer - - rely on resolved addresses but to just use server names as provided by the - - user. - fix dialog window creation - - Add a minimal width so dialog windows with input lines have at least the - - size of the input line. 2014-08-15: 5.0.14 - - Merge pull request #23 from openSUSE/sw_0011 - - add vlan dialog - fix net_input_vlanid() - add vlan dialog @@ -60,56 +43,33 @@ - add 'nanny' option to control wickedd-nanny; disable by default 2014-08-11: 5.0.12 - - Merge pull request #21 from openSUSE/sw_0009 - - netsetup=dhcp didn't work (bnc #890874, bnc #889887) - netsetup=dhcp didn't work (bnc #890874, bnc #889887) - reactivate netsetup=dhcp,all (bnc #891080) -2014-08-08: 5.0.11 - - Merge pull request #20 from openSUSE/sw_0008 - - Enhance linuxrc network code a bit. +2014-08-07: 5.0.11 - Enhance linuxrc network code a bit. - set WAIT_FOR_INTERFACES (bnc #890643) - allow global network config options that should go to /etc/sysconfig/network/config to be set in ifcfg option 2014-08-06: 5.0.10 - - Merge pull request #19 from openSUSE/sw_0007 - - Sw 0007 - add new 'sshd' option to start sshd during install but don't trigger a ssh installation - apply netwait also to static setup - add wicked.timeout as alias to dhcp.timeout - extend debugwait syntax - - Now shell wildcard patterns are allowed and you can also match against function names. - - The debugwait option accepts comma-separated pattern list. - free screen memory only after we allocated it 2014-08-04: 5.0.9 - - Merge pull request #18 from openSUSE/sw_0006 - - Sw 0006 - explicitly set CURLOPT_IPRESOLVE to debug/workaround resolve issues (bnc #889981) - Unify password handling and add password.enc option to pass encrypted passwords. - - There is an unused 'password' option; make it an alias to 'sshpassword' and - - set password even without ssh enabled (it's also used for rescue system). - - Add 'password.enc' and 'sshpassword.enc' to allow passing passwords in - - encrypted form. 2014-07-31: 5.0.8 - - Merge pull request #16 from openSUSE/sw_0004 - - fix point-to-point interface handling (bnc #889580) - fix point-to-point interface handling (bnc #889580) -2014-07-30: 5.0.7 - - Merge pull request #15 from openSUSE/sw_0003 - - pass along hostname if explicitly set (bnc #889374) - - pass along hostname if explicitly set (bnc #889374) - - Merge pull request #14 from mvidner/readme - - Read me. +2014-07-28: 5.0.7 - Read me. 2014-07-28: 5.0.6 - - Merge pull request #13 from openSUSE/sw_0002 - - Sw 0002 - add missing break - more dead code cleanup - fix evil nameserver config bug @@ -117,8 +77,6 @@ - make log file script behave 2014-07-25: 5.0.5 - - Merge pull request #12 from openSUSE/sw_0001 - - Sw 0001 - remove more parts of old network code - remove obsolete config.netdevice @@ -175,8 +133,6 @@ - code cleanup: better wicked integration, removed obsolete code 2014-07-04: 4.2.40 - - Merge pull request #11 from openSUSE/bnc885676 - - Revert to previous handling of config.hwp.layer2 variable. - read linuxrc config also from /etc/linuxrc.d - Revert to previous handling of config.hwp.layer2 variable. - Try to document why we're using something other than 0 and 1 for values for layer2, protocol, and portno. @@ -186,20 +142,12 @@ - more logging for fcoe and efi detection - reworked ifcfg option to support vlan and setting arbirary config file entries -2014-07-02: 4.2.38 - - Merge pull request #10 from openSUSE/bnc885231 - - Check for a selection of 0 when returning from dia_list to choose the network device +2014-07-01: 4.2.38 - Check for a selection of 0 when returning from dia_list to choose the network device. 2014-07-01: 4.2.37 - move udev start script to /script dir - added new 'ifcfg' option to configure network - - Simple examples are ifcfg=*=dhcp (configure all devices with dhcp) or - - ifcfg=eth0=10.0.1.1/24,10.0.1.254 (eth0: static setup, ip 10.0.1.1, - - netmask 255.255.255.0, gateway 10.0.1.254). See linuxrc docu for more. - - The main difference to the existing (old) network setup strategy is that - - 'ifcfg' just creates config files in /etc/sysconfig/network and runs wicked. - - It doesn't 'try' the config on every interface until one works. 2014-06-25: 4.2.36 - tag ibft interface as persistent @@ -214,7 +162,6 @@ 2014-06-17: 4.2.33 - don't kill haveged (bnc #875848) - - We start haveged early in in linuxrc now. So don't accidentally kill it. 2014-06-06: 4.2.32 - fix s390x network setup properly (bnc #881342) @@ -222,9 +169,7 @@ 2014-06-05: 4.2.31 - s390x: wait 3s after loading qeth module -2014-05-30: 4.2.30 - - Merge pull request #9 from openSUSE/bnc879893 - - s390: choose thermonuclear option to deal with whitespace issues +2014-05-28: 4.2.30 - s390: choose thermonuclear option to deal with whitespace issues once and for all (bnc #706605) - s390: allow empty parameters for portname, portno and @@ -248,14 +193,9 @@ 2014-05-15: 4.2.25 - suppress edd failed message -2014-05-15: 4.2.24 - - fix compilation - - Merge pull request #8 from openSUSE/layer2test - - Layer2test +2014-05-14: 4.2.24 - Adjust the branch to match the current master. - Revert "Initial changes to use IBM-supplied chzdev command instead of our *_configure commands." - - The feature request in FATE for this was withdrawn. - - This reverts commit 883b0f334dfcc00cc03a24911522fb4de57c4a83. - Move check for config.hwp.layer2 to the correct line. - Fix for bnc #855696 - Only ask if DHCP is to be used for Layer 2 interfaces. @@ -274,21 +214,15 @@ - iscsi detection also looks for iscsi_boot* (bnc #876104) 2014-04-24: 4.2.20 - - Merge branch 'netx' - minor corrections - fix some bugs in last patch and add logging - Signature checking of compressed driver updates now works (bnc #836366). - - We do this by delaying the uncompression and handling it in util_mount(). - - Before we uncompressed while downloading. - support unpacking of tar archives - support xz compression - reworked filesystem type detection, added tar - apply timeout option to wicked -2014-04-22: 4.2.19 - - fix compiler warning - - Merge pull request #7 from openSUSE/s390xkvm - - Fix for bnc #843438. +2014-04-21: 4.2.19 - Fix for bnc #843438. Add KVM detection on s390x. If running under KVM on s390x, only offer a virtio network device. @@ -306,15 +240,13 @@ 2014-04-11: 4.2.17 - add withipoib option to trigger loading ip over infiniband modules (bnc #865852) -2014-04-08: 4.2.16 - - Merge pull request #6 from openSUSE/iucvtest - - Introduce detection of z/VM or LPAR hypervisors. +2014-04-07: 4.2.16 - Added util_umount('/sys/hypervisor/s390'); to lxrc_end. - Moved the check for config.net.ptp to the correct spot in the logic. - Add #if/#endif to last change to net.c - Introduce detection of z/VM or LPAR hypervisors. - If running on z/VM always try to modprobe the netiucv kernel module - - Don\'t prompt for DHCP if using a pont-to-point network interface. (bnc #865097) + - Don't prompt for DHCP if using a pont-to-point network interface. (bnc #865097) 2014-03-26: 4.2.15 - fix gcc aliasing warning @@ -327,13 +259,7 @@ - ensure echo is on (bnc #865956) 2014-03-10: 4.2.13 - - Merge pull request #5 from openSUSE/fate316530 - - Fate316530 - add 'autoyast2' option in preparation to fate #316530 - - The difference to 'autoyast' is that linuxrc itself downloads the file and - - passes the autoyast.xml file to yast. - - We have to use a different option name because autoyast uses it's own - - url schemes different from linuxrc. - s390: make sure network device has been activated before driver update (bnc #616341, bnc #862673) @@ -373,10 +299,7 @@ 2013-12-20: 4.2.4 - make linemode default on s390, swap linemode 1 & 2 -2013-12-19: 4.2.3 - - allow linuxrc to be restarted - - Merge pull request #4 from openSUSE/fate316139 - - Initial changes to use IBM-supplied chzdev command instead of our *_conf... +2013-12-17: 4.2.3 - Initial changes to use IBM-supplied chzdev command instead of our *_configure commands. 2013-12-05: 4.2.2 @@ -388,18 +311,8 @@ - allow media checks of any device (bnc #848020) - add back language menu -2013-11-18: 4.2.0 - - add back language defines - - nfs: use mount(8) and mount.nfs(8) to mount nfs exports (bnc #799496) - - if no install url given, try dvds, then hds - - Merge branch 'master' of gitorious.org:opensuse/linuxrc - - s390: handle empty portname correctly (bnc #760042) - - s390: handle empty portname correctly (bnc #760042) - - Merge branch 'master' of gitorious.org:opensuse/linuxrc - - Conflicts: - dialog.c +2012-07-05: 4.2.0 - remove i18n infrastructure and translations - - Signed-off-by: Ulrich Hecht <uli(a)suse.de> 2013-01-16: 4.1.4 - drop /etc/nothing @@ -412,54 +325,13 @@ 2012-12-13: 4.1.1 - Revert "clean-up: removed built-in extend" - - This reverts commit 2c59f72fee9d308dd791090c898b48bbb7fbbc21. -2012-11-26: 4.1.0 - - make sure WORDS_BIGENDIAN is defined correctly where needed (bnc #755861) - - add *.conf to modprobe config files to make them work (bnc #775800) - - fix console setup after plymouth - - turn off plymouth at first opportunity - - add plymouth config option - - remove lots of disabled code - - Signed-off-by: Ulrich Hecht <uli(a)suse.de> - - fix warnings about computed values not being used - - Signed-off-by: Ulrich Hecht <uli(a)suse.de> - - remove reference to hotplug.h from net.c - - Signed-off-by: Ulrich Hecht <uli(a)suse.de> - - clean-up: removed built-in hotplug - - Signed-off-by: Ulrich Hecht <uli(a)suse.de> - - clean-up: removed built-in extend - - Signed-off-by: Ulrich Hecht <uli(a)suse.de> - - clean-up: removed built-in swapoff, raidautorun, free, wget, fstype, nothing - - Signed-off-by: Ulrich Hecht <uli(a)suse.de> - - clean-up: removed built-in mkdir, chroot, kill, killall - - Signed-off-by: Ulrich Hecht <uli(a)suse.de> - - clean-up: removed built-in ls, rm, mv, ln - - Signed-off-by: Ulrich Hecht <uli(a)suse.de> - - clean-up: removed built-in cat, hex, echo, ps, lsof - - Signed-off-by: Ulrich Hecht <uli(a)suse.de> - - clean-up: removed built-in mount, umount - - Signed-off-by: Ulrich Hecht <uli(a)suse.de> - - clean-up: removed built-in rmmod, lsmod - - Signed-off-by: Ulrich Hecht <uli(a)suse.de> - - clean-up: remove mkdevs, staticdevices option - - Signed-off-by: Ulrich Hecht <uli(a)suse.de> - - slp: error handling bug (found by clang) - - Signed-off-by: Ulrich Hecht <uli(a)suse.de> - - url: eliminate non-standard nested functions - - Signed-off-by: Ulrich Hecht <uli(a)suse.de> - - Merge branch 'master' of gitorious.org:opensuse/linuxrc +2012-06-05: 4.1.0 - clean-up: dump bootp - - dhcpcd can do bootp if necessary - - Signed-off-by: Ulrich Hecht <uli(a)suse.de> - clean-up: ditch exploding windows - - Signed-off-by: Ulrich Hecht <uli(a)suse.de> - clean-up: remove unused tftp code - - Signed-off-by: Ulrich Hecht <uli(a)suse.de> - clean-up: remove lsh (we have bash now) - - Signed-off-by: Ulrich Hecht <uli(a)suse.de> - clean-up: remove token ring code and messages - - Signed-off-by: Ulrich Hecht <uli(a)suse.de> 2012-05-30: 4.0.5 - give tmpfs a finite size @@ -610,9 +482,6 @@ - ensure 'extend' returns correct error code (bnc #510999) 2009-09-09: 3.4.5 - - Merge branch 'master' of git@gitorious.org:opensuse/linuxrc - - Conflicts: - Changelog - no blocking popup for DHCP error message (bnc #534078) - starting new network setup code - s390: activate network interface before loading info file @@ -743,8 +612,8 @@ 2008-09-19: 3.3.5 - bump version - - s390: fixed flaky net device name detection (bnc #427475) - - s390: don't ask for network parameters twice + - s390: fixed flaky net device name detection (bnc #427475) + - s390: don't ask for network parameters twice 2008-09-17: 3.3.4 - make 'extend' a bit faster @@ -781,7 +650,7 @@ 2008-07-24: 3.2.2 - pass sax2 parameter - add some options - - 'extend' can now add and remove inst-sys parts + - 'extend' can now add and remove inst-sys parts 2008-07-21: 3.2.1 - reall ppc64 @@ -1219,8 +1088,8 @@ 2006-08-30: 2.1.1 - remove libsysfs but for s390 - changed tftp to bind to different port for each connection (bnc #187745) - - tell the user what file we failed to FTP - - s390: accept upper-case CCW addresses + - tell the user what file we failed to FTP + - s390: accept upper-case CCW addresses - set min vnc password length to 8 (bnc #184204) - s390: make CTC mode dialog wider (bnc #186563) @@ -1371,7 +1240,6 @@ - hare: s390 hotplug fix 2006-01-16: 2.0.9 - - Dutch texts updated - make sure /sbin/hotplug gets events - remove "devz" - pass iscsi option to yast (fate #85) @@ -1488,7 +1356,7 @@ - added armv4l support 2005-04-06: 1.8.9 - - s390: SCRIPTUP_* entries in hwcfg-* files must be lower-case + - s390: SCRIPTUP_* entries in hwcfg-* files must be lower-case after the underscore 2005-04-05: 1.8.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.21/net.c new/linuxrc-5.0.23/net.c --- old/linuxrc-5.0.21/net.c 2014-09-18 09:50:06.000000000 +0200 +++ new/linuxrc-5.0.23/net.c 2014-09-26 11:07:47.000000000 +0200 @@ -2270,6 +2270,14 @@ } } +#if defined(__s390__) || defined(__s390x__) + // s390 layer2 interfaces + if(config.hwp.layer2 && config.hwp.osahwaddr) { + sl = slist_append_str(&sl_ifcfg, "LLADDR"); + str_copy(&sl->value, config.hwp.osahwaddr); + } +#endif + if(sl_ifcfg) { if(asprintf(&fname, "/etc/sysconfig/network/ifcfg-%s%s", device, vlan ?: "") == -1) fname = NULL; fprintf(stderr, "creating ifcfg-%s%s:\n", device, vlan ?: ""); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-09-28 19:58:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2014-09-25 08:42:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-09-28 19:58:49.000000000 +0200 @@ -1,0 +2,44 @@ +Fri Sep 26 10:16:52 CEST 2014 - ms(a)suse.de + +- v5.06.165 released + +------------------------------------------------------------------- +Fri Sep 26 09:00:35 CEST 2014 - ms(a)suse.de + +- Make sure to wait for nic link up (bnc #898505) + +------------------------------------------------------------------- +Thu Sep 25 17:48:18 CEST 2014 - ms(a)suse.de + +- Fixed double encoded luks system (bnc #898249) + + when kiwi builds a disk image it can either dump a filesystem + image onto a raw partition or it rsync a tree of files onto + a partition which has a filesystem created on top of a subsystem + or a subsystem stack like lvm, luks, etc. In kiwi this is + controlled by the value of the $treeAccess variable. If + treeAccess is disabled but the support for syncing a tree in + the given configuration is implemented this results in + duplicate preparation of the filesystem and the subsystems + which results in an unbootable mess. + +------------------------------------------------------------------- +Thu Sep 25 15:42:50 CEST 2014 - ms(a)suse.de + +- Fixed passthrough of luks cipher (bnc #898249) + + kiwi passed the ciper using a shell echo command which is + bad because the shell evaluates the contents of this information + and might break the cipher if it contains shell meta characters. + This patch fixes this by using a simple pipe stream to the + cryptsetup process without invoking a shell command + +------------------------------------------------------------------- +Thu Sep 25 15:09:38 CEST 2014 - ms(a)suse.de + +- Fixed URI credentials setup + + Make sure the ?credentials=kiwiRepoCredentials flag is only added + to the url if the appropriate credentials file exists + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.wA4Hfa/_old 2014-09-28 19:58:50.000000000 +0200 +++ /var/tmp/diff_new_pack.wA4Hfa/_new 2014-09-28 19:58:50.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 5.06.164 +Version: 5.06.165 Release: 0 Provides: kiwi-image:lxc Provides: kiwi-image:tbz ++++++ kiwi-docu.tar.bz2 ++++++ ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2014-09-17 16:25:06.000000000 +0200 +++ new/kiwi/.revision 2014-09-17 16:25:06.000000000 +0200 @@ -1 +1 @@ -f4d771186d69107fa3962967635f028b541d3ade +6a1c9d1ec096f8734d3408625513abf1607a8615 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2014-09-16 11:42:36.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2014-09-26 10:22:22.000000000 +0200 @@ -6667,21 +6667,19 @@ return; } $kiwi -> info ("--> Creating LUKS encoding\n"); - $data = KIWIQX::qxx ( - "echo $cipher | cryptsetup -q $opts luksFormat $device 2>&1" + $code = KIWIGlobals -> instance() -> cryptsetup ( + $cipher, "-q $opts luksFormat $device" ); - $code = $? >> 8; if ($code != 0) { $kiwi -> error ("Couldn't setup luks format: $device"); $kiwi -> failed (); return; } - $data = KIWIQX::qxx ( - "echo $cipher | cryptsetup luksOpen $device $name 2>&1" + $code = KIWIGlobals -> instance() -> cryptsetup ( + $cipher, "luksOpen $device $name" ); - $code = $? >> 8; if ($code != 0) { - $kiwi -> error ("Couldn't open luks device: $data"); + $kiwi -> error ("Couldn't open luks device: $device"); $kiwi -> failed (); $this -> cleanStack (); return; @@ -6939,16 +6937,16 @@ # open luks device #------------------------------------------ if ($cipher) { - $status = KIWIQX::qxx ( - "echo $cipher | cryptsetup luksOpen $source $name 2>&1" + $result = KIWIGlobals -> instance() -> cryptsetup( + $cipher, "luksOpen $source $name" ); } else { - $status = KIWIQX::qxx ("cryptsetup luksOpen $source $name 2>&1"); + KIWIQX::qxx ("cryptsetup luksOpen $source $name 2>&1"); + $result = $? >> 8; } - $result = $? >> 8; if ($result != 0) { $kiwi -> failed (); - $kiwi -> error ("Couldn't open luks device: $status"); + $kiwi -> error ("Couldn't open luks device: $source"); $kiwi -> failed (); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2014-09-23 13:18:28.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2014-09-26 10:22:22.000000000 +0200 @@ -159,6 +159,7 @@ my $salt = int (rand(20)); my $cipher = $this->{data}->{LuksCipher}; my @UmountStack = @{$this->{UmountStack}}; + my $global = KIWIGlobals -> instance(); my $status; my $result; my %fsattr; @@ -298,17 +299,15 @@ $this->{UmountStack} = \@UmountStack; } if ($cipher) { - $status = KIWIQX::qxx ( - "echo $cipher | cryptsetup luksOpen $source luks-$salt 2>&1" + $result = $global -> cryptsetup ( + $cipher, "luksOpen $source luks-$salt" ); } else { - $status = KIWIQX::qxx ( - "cryptsetup luksOpen $source luks-$salt 2>&1" - ); + KIWIQX::qxx ("cryptsetup luksOpen $source luks-$salt"); + $result = $? >> 8; } - $result = $? >> 8; if ($result != 0) { - $kiwi -> error ("Couldn't open luks device: $status"); + $kiwi -> error ("Couldn't open luks device: $source"); $kiwi -> failed (); $this -> umount(); return; @@ -1832,7 +1831,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.06.164"; + $data{Version} = "5.06.165"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi"; $data{ConfigName} = "config.xml"; @@ -2013,4 +2012,26 @@ return 1; } +#========================================== +# cryptsetup +#------------------------------------------ +sub cryptsetup { + # ... + # Calls cryptsetup with the given options and expects + # an input blob on stdin as the credentials + # --- + my $this = shift; + my $kiwi = $this->{kiwi}; + my $cipher = shift; + my $copts = shift; + $kiwi -> loginfo("EXEC [cryptsetup $copts]\n"); + my $C = FileHandle -> new(); + if ($C -> open ("|cryptsetup $copts")) { + print $C $cipher; + $C -> close(); + return 0; + } + return 1; +} + 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImage.pm new/kiwi/modules/KIWIImage.pm --- old/kiwi/modules/KIWIImage.pm 2014-09-12 12:41:26.000000000 +0200 +++ new/kiwi/modules/KIWIImage.pm 2014-09-26 10:22:22.000000000 +0200 @@ -877,14 +877,9 @@ #========================================== # Check for direct tree access #------------------------------------------ - my $luks = $xmltype -> getLuksPass(); - if (($text ne 'VMX') || ($luks)) { + if ($text eq 'PXE') { $treeAccess = 0; } - my $lvm = KIWIGlobals -> instance() -> useLVM($xml); - if ($lvm) { - $treeAccess = 1; - } #========================================== # Walk through the types #------------------------------------------ @@ -3739,19 +3734,19 @@ $kiwi -> failed (); return; } - $data = KIWIQX::qxx ( - "echo $cipher | cryptsetup -q $opts luksFormat $loop 2>&1" + $code = KIWIGlobals -> instance() -> cryptsetup ( + $cipher, "-q $opts luksFormat $loop" ); - $code = $? >> 8; if ($code != 0) { $kiwi -> error ("Couldn't setup luks format: $loop"); $kiwi -> failed (); return; } - $data = KIWIQX::qxx ("echo $cipher | cryptsetup luksOpen $loop $name 2>&1"); - $code = $? >> 8; + $code = KIWIGlobals -> instance() -> cryptsetup ( + $cipher, "luksOpen $loop $name" + ); if ($code != 0) { - $kiwi -> error ("Couldn't open luks device: $data"); + $kiwi -> error ("Couldn't open luks device: $loop"); $kiwi -> failed (); $this -> cleanLuks (); return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2014-09-21 11:04:32.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2014-09-26 10:22:22.000000000 +0200 @@ -4734,8 +4734,7 @@ if [ $try_iface = "lo" ];then continue fi - Echo "Waiting for link up on $try_iface..." - sleep 1 + waitForLinkUp $try_iface dhcp_info=/var/run/wicked/wicked-${try_iface}.info $wicked_dhcp4 --debug all \ --test --test-output $dhcp_info $try_iface @@ -6857,7 +6856,29 @@ sleep 2 done } - +#====================================== +# waitForLinkUp +#-------------------------------------- +function waitForLinkUp { + # /.../ + # wait for the network link to enter UP state + # ---- + local IFS=$IFS_ORIG + local dev=$1 + local check=0 + while true;do + ip link ls $dev | grep -qi "state UP" + if [ $? = 0 ];then + sleep 1; return 0 + fi + if [ $check -eq 30 ];then + return 1 + fi + Echo "Waiting for link up on ${dev}..." + check=$((check + 1)) + sleep 2 + done +} #====================================== # waitForBlockDevice #-------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIManagerZypper.pm new/kiwi/modules/KIWIManagerZypper.pm --- old/kiwi/modules/KIWIManagerZypper.pm 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/modules/KIWIManagerZypper.pm 2014-09-26 10:22:22.000000000 +0200 @@ -322,8 +322,11 @@ if ($val =~ /^'\//) { $val =~ s/^'(.*)'$/"file:\/\/$1"/ } - if ($val =~ /^'https:/ && ! ($val =~ /credentials=\w/)) { - chop $val; + my $credFile = "$dataDir/credentials.d/kiwiRepoCredentials"; + if ((-e $credFile) && + ($val =~ /^'https:/) && ($val !~ /credentials=\w/) + ) { + chop $val; $val .= "?credentials=kiwiRepoCredentials'"; } push (@zopts,$val); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIProfileFile.pm new/kiwi/modules/KIWIProfileFile.pm --- old/kiwi/modules/KIWIProfileFile.pm 2014-09-12 12:41:26.000000000 +0200 +++ new/kiwi/modules/KIWIProfileFile.pm 2014-09-26 10:22:22.000000000 +0200 @@ -82,7 +82,6 @@ kiwi_keytable kiwi_language kiwi_loader_theme - kiwi_luks kiwi_lvm kiwi_lvmgroup kiwi_oemataraid_scan -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libical for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package libical for openSUSE:Factory checked in at 2014-09-28 19:58:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libical (Old) and /work/SRC/openSUSE:Factory/.libical.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libical" Changes: -------- --- /work/SRC/openSUSE:Factory/libical/libical.changes 2014-09-19 13:56:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libical.new/libical.changes 2014-09-28 19:58:38.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Sep 26 05:25:01 UTC 2014 - coolo(a)suse.com + +- disable parallel build, too unreliable + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libical.spec ++++++ --- /var/tmp/diff_new_pack.eRBjr5/_old 2014-09-28 19:58:38.000000000 +0200 +++ /var/tmp/diff_new_pack.eRBjr5/_new 2014-09-28 19:58:38.000000000 +0200 @@ -89,7 +89,7 @@ %build %cmake -make %{?_smp_mflags} +make -j1 %install %cmake_install -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi-instsource-plugins-openSUSE-13-2 for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package kiwi-instsource-plugins-openSUSE-13-2 for openSUSE:Factory checked in at 2014-09-28 19:58:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-13-2 (Old) and /work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-13-2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi-instsource-plugins-openSUSE-13-2" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-13-2/kiwi-instsource-plugins-openSUSE-13-2.changes 2014-07-04 09:34:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-13-2.new/kiwi-instsource-plugins-openSUSE-13-2.changes 2014-09-28 19:58:28.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Sep 19 07:10:33 UTC 2014 - coolo(a)suse.com + +- update from git to fix bnc#895021 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-instsource-plugins-openSUSE-13-2.spec ++++++ --- /var/tmp/diff_new_pack.2tjr14/_old 2014-09-28 19:58:29.000000000 +0200 +++ /var/tmp/diff_new_pack.2tjr14/_new 2014-09-28 19:58:29.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package kiwi-instsource-plugins-openSUSE-13-2 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,9 +38,9 @@ %description OpenSuSE - KIWI Image System InstSource plugins provides information -and plugin code to create meta information for a Novell/SUSE -installation source This particular package contains the metadata -plugins specific for the openSUSE-11.1 targets. +and plugin code to create meta information for a SUSE +installation source. This particular package contains the metadata +plugins specific for the suse-13.2 targets. %prep %setup -q -n kiwi-instsource-plugins-openSUSE-13-2 ++++++ kiwi-instsource-plugins-openSUSE-13-2.tar.xz ++++++ ++++ 2069 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 libnetfilter_conntrack for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package libnetfilter_conntrack for openSUSE:Factory checked in at 2014-09-28 19:58:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libnetfilter_conntrack (Old) and /work/SRC/openSUSE:Factory/.libnetfilter_conntrack.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libnetfilter_conntrack" Changes: -------- --- /work/SRC/openSUSE:Factory/libnetfilter_conntrack/libnetfilter_conntrack.changes 2013-08-13 13:05:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libnetfilter_conntrack.new/libnetfilter_conntrack.changes 2014-09-28 19:58:26.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 23 15:45:35 UTC 2014 - jengelh(a)inai.de + +- Drop gpg-offline build-time requirement; this is now handled by + the local source validator + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnetfilter_conntrack.spec ++++++ --- /var/tmp/diff_new_pack.dbGz3p/_old 2014-09-28 19:58:27.000000000 +0200 +++ /var/tmp/diff_new_pack.dbGz3p/_new 2014-09-28 19:58:27.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libnetfilter_conntrack # -# 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 @@ -25,7 +25,6 @@ License: GPL-2.0+ Group: Productivity/Networking/Security -#Freecode-URL: http://freecode.com/projects/libnetfilter_conntrack/ #Git-Clone: git://git.netfilter.org/libnetfilter_conntrack #DL-URL: http://netfilter.org/projects/libnetfilter_conntrack/files/ Source: http://netfilter.org/projects/libnetfilter_conntrack/files/%name-%version.t… @@ -35,16 +34,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf, automake >= 1.6, libtool BuildRequires: pkgconfig >= 0.21 -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} BuildRequires: pkgconfig(libmnl) >= 1.0.3 BuildRequires: pkgconfig(libnfnetlink) >= 1.0.0 -%else -BuildRequires: libmnl-devel >= 1.0.3 -BuildRequires: libnfnetlink-devel >= 1.0.0 -%endif -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif %description libnetfilter_conntrack is a userspace library providing a programming @@ -77,7 +68,6 @@ used by conntrack-tools among many other applications. %prep -%{?gpg_verify: %gpg_verify %{S:2}} %setup -q %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vlan for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package vlan for openSUSE:Factory checked in at 2014-09-28 19:58:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vlan (Old) and /work/SRC/openSUSE:Factory/.vlan.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vlan" Changes: -------- --- /work/SRC/openSUSE:Factory/vlan/vlan.changes 2012-02-16 15:03:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.vlan.new/vlan.changes 2014-09-28 19:58:25.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Sep 24 05:47:11 UTC 2014 - mt(a)suse.com + +- Removed obsolete README.SuSE (fate#316521,bnc#888999), + see ifcfg-vlan(5) manual page for actual informations. + +------------------------------------------------------------------- Old: ---- README.SuSE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vlan.spec ++++++ --- /var/tmp/diff_new_pack.mc8Hbr/_old 2014-09-28 19:58:26.000000000 +0200 +++ /var/tmp/diff_new_pack.mc8Hbr/_new 2014-09-28 19:58:26.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package vlan # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,6 @@ # - Name: vlan BuildRequires: gcc-c++ Url: http://www.candelatech.com/~greear/vlan.html @@ -27,7 +26,6 @@ Group: Productivity/Networking/Other Source: http://www.candelatech.com/~greear/vlan/vlan.%{version}.tar.bz2 Source1: http://scry.wanfear.com/~greear/vlan/cisco_howto.html.bz2 -Source2: README.SuSE BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -56,11 +54,10 @@ #UsrMerge ln -sf %_sbindir/vconfig $RPM_BUILD_ROOT/sbin #EndUsrMerge -cp %SOURCE2 . %files %defattr(644,root,root,755) -%doc *.html *.pl CHANGELOG README README.SuSE +%doc *.html *.pl CHANGELOG README %doc %{_mandir}/man8/vconfig.8.gz %attr(755,root,root) %_sbindir/vconfig #UsrMerge -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dosfstools for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package dosfstools for openSUSE:Factory checked in at 2014-09-28 19:58:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dosfstools (Old) and /work/SRC/openSUSE:Factory/.dosfstools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dosfstools" Changes: -------- --- /work/SRC/openSUSE:Factory/dosfstools/dosfstools.changes 2014-07-01 07:05:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dosfstools.new/dosfstools.changes 2014-09-28 19:58:23.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 23 16:12:53 UTC 2014 - jengelh(a)inai.de + +- Drop gpg-offline build-time requirement; this is now handled by + the local source validator + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dosfstools.spec ++++++ --- /var/tmp/diff_new_pack.rXSi1X/_old 2014-09-28 19:58:23.000000000 +0200 +++ /var/tmp/diff_new_pack.rXSi1X/_new 2014-09-28 19:58:23.000000000 +0200 @@ -23,7 +23,7 @@ License: GPL-3.0+ Group: System/Filesystems Url: http://daniel-baumann.ch/software/dosfstools/ -#Freecode-URL: http://freecode.com/projects/dosfstools + #Git-Clone: git://daniel-baumann.ch/git/software/dosfstools Source: http://daniel-baumann.ch/files/software/dosfstools/%{name}-%{version}.tar.xz Source2: http://daniel-baumann.ch/files/software/dosfstools/%{name}-%{version}.tar.x… @@ -33,9 +33,6 @@ Provides: dosfsck Provides: mkdosfs BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif %description The dosfstools package includes the mkdosfs and dosfsck utilities, @@ -43,7 +40,6 @@ drives or on floppies. %prep -%{?gpg_verify: %gpg_verify %{SOURCE2}} %setup -q %patch0 -p1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package kdebase4-openSUSE for openSUSE:Factory checked in at 2014-09-28 19:58:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kdebase4-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-openSUSE/kdebase4-openSUSE.changes 2014-05-29 08:43:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-openSUSE.new/kdebase4-openSUSE.changes 2014-09-28 19:58:13.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 23 19:55:16 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Push new KDE branding for 13.2 +- Put also config and colorschemes into kdebase4-runtime branding + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.HAncvZ/_old 2014-09-28 19:58:13.000000000 +0200 +++ /var/tmp/diff_new_pack.HAncvZ/_new 2014-09-28 19:58:13.000000000 +0200 @@ -154,6 +154,9 @@ %dir %{_kde4_appsdir}/desktoptheme %{_kde4_appsdir}/desktoptheme/openSUSEdefault %{_kde4_appsdir}/desktoptheme/openSUSE +%{_kde4_appsdir}/desktoptheme/openSUSElight/ +%{_kde4_appsdir}/color-schemes +%config %{_sysconfdir}/kde4 %files -n kdebase4-workspace-branding-openSUSE %defattr(-,root,root) @@ -165,7 +168,6 @@ %{_kde4_appsdir}/konsole/ %{_kde4_appsdir}/kwin/ %{_kde4_appsdir}/plasma-desktop -%{_kde4_appsdir}/color-schemes %{_kde4_appsdir}/SUSEgreeter %{_kde4_bindir}/SUSEgreeter %dir %{_kde4_configdir} @@ -192,7 +194,6 @@ %{_kde4_iconsdir}/oxygen/ %{_kde4_sharedir}/env/ %{_localstatedir}/adm/fillup-templates/sysconfig.windowmanager-kde4 -%config %{_sysconfdir}/kde4 %_kde4_appsdir/plasma-desktop %_kde4_appsdir/plasma-netbook %_kde4_appsdir/plasma ++++++ kdebase4-openSUSE-13.2.tar.bz2 ++++++ ++++ 87435 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 tevent for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package tevent for openSUSE:Factory checked in at 2014-09-28 19:58:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tevent (Old) and /work/SRC/openSUSE:Factory/.tevent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tevent" Changes: -------- --- /work/SRC/openSUSE:Factory/tevent/tevent.changes 2014-02-19 18:55:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tevent.new/tevent.changes 2014-09-28 19:58:03.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 23 20:41:59 UTC 2014 - lmuelle(a)suse.com + +- Utilize doxygen to generate the API documentation and package it. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tevent.spec ++++++ --- /var/tmp/diff_new_pack.Q8mF8Y/_old 2014-09-28 19:58:03.000000000 +0200 +++ /var/tmp/diff_new_pack.Q8mF8Y/_new 2014-09-28 19:58:03.000000000 +0200 @@ -138,11 +138,19 @@ %{__make} %{build_make_smp_mflags} \ all +doxygen doxy.config + %check %{__make} test %install DESTDIR=${RPM_BUILD_ROOT} make install + +# install API docs +mkdir -p $RPM_BUILD_ROOT/%{_mandir} +cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir} +rm $RPM_BUILD_ROOT/%{_mandir}/man3/todo.3 + # Shared libraries need to be marked executable for rpmbuild to strip them and # include them in debuginfo find ${RPM_BUILD_ROOT} -name "*.so*" -exec chmod -c +x {} \; @@ -164,6 +172,7 @@ %{_includedir}/tevent.h %{_libdir}/libtevent.so %{_libdir}/pkgconfig/tevent.pc +%{_mandir}/man3/tevent*.* %files -n python-tevent %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-zope.interface for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package python-zope.interface for openSUSE:Factory checked in at 2014-09-28 19:58:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-zope.interface (Old) and /work/SRC/openSUSE:Factory/.python-zope.interface.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-zope.interface" Changes: -------- --- /work/SRC/openSUSE:Factory/python-zope.interface/python-zope.interface.changes 2014-02-26 06:55:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-zope.interface.new/python-zope.interface.changes 2014-09-28 19:58:02.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 16 13:53:43 UTC 2014 - tbechtold(a)suse.com + +- Update to version 4.1.1: + * Added support for Python 3.4. + +------------------------------------------------------------------- Old: ---- zope.interface-4.1.0.tar.gz New: ---- zope.interface-4.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-zope.interface.spec ++++++ --- /var/tmp/diff_new_pack.18WTUS/_old 2014-09-28 19:58:03.000000000 +0200 +++ /var/tmp/diff_new_pack.18WTUS/_new 2014-09-28 19:58:03.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-zope.interface -Version: 4.1.0 +Version: 4.1.1 Release: 0 Url: http://pypi.python.org/pypi/zope.interface Summary: Interfaces for Python ++++++ zope.interface-4.1.0.tar.gz -> zope.interface-4.1.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zope.interface-4.1.0/.gitignore new/zope.interface-4.1.1/.gitignore --- old/zope.interface-4.1.0/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/zope.interface-4.1.1/.gitignore 2013-01-07 23:41:46.000000000 +0100 @@ -0,0 +1,16 @@ +*.pyc +*.so +__pycache__ +.installed.cfg +bin +eggs +develop-eggs +docs +parts +*.egg-info +build +docs/_build +.coverage +.tox +nosetests.xml +coverage.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zope.interface-4.1.0/.travis.yml new/zope.interface-4.1.1/.travis.yml --- old/zope.interface-4.1.0/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/zope.interface-4.1.1/.travis.yml 2013-06-13 00:43:21.000000000 +0200 @@ -0,0 +1,13 @@ +language: python +python: + - 2.6 + - 2.7 + - 3.2 + - 3.3 + - pypy +install: + - pip install . --use-mirrors +script: + - python setup.py test -q +notifications: + email: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zope.interface-4.1.0/CHANGES.rst new/zope.interface-4.1.1/CHANGES.rst --- old/zope.interface-4.1.0/CHANGES.rst 2014-02-06 03:11:02.000000000 +0100 +++ new/zope.interface-4.1.1/CHANGES.rst 2014-03-19 19:34:00.000000000 +0100 @@ -1,6 +1,12 @@ ``zope.interface Changelog`` ============================ +4.1.1 (2014-03-19) +------------------ + +- Added support for Python 3.4. + + 4.1.0 (2014-02-05) ------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zope.interface-4.1.0/PKG-INFO new/zope.interface-4.1.1/PKG-INFO --- old/zope.interface-4.1.0/PKG-INFO 2014-02-06 03:13:05.000000000 +0100 +++ new/zope.interface-4.1.1/PKG-INFO 2014-03-19 19:34:39.000000000 +0100 @@ -1,6 +1,6 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.0 Name: zope.interface -Version: 4.1.0 +Version: 4.1.1 Summary: Interfaces for Python Home-page: http://pypi.python.org/pypi/zope.interface Author: Zope Foundation and Contributors @@ -25,6 +25,12 @@ ``zope.interface Changelog`` ============================ + 4.1.1 (2014-03-19) + ------------------ + + - Added support for Python 3.4. + + 4.1.0 (2014-02-05) ------------------ @@ -423,6 +429,7 @@ Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.2 Classifier: Programming Language :: Python :: 3.3 +Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: Python :: Implementation :: PyPy Classifier: Framework :: Zope3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zope.interface-4.1.0/bootstrap.py new/zope.interface-4.1.1/bootstrap.py --- old/zope.interface-4.1.0/bootstrap.py 1970-01-01 01:00:00.000000000 +0100 +++ new/zope.interface-4.1.1/bootstrap.py 2013-07-10 02:33:10.000000000 +0200 @@ -0,0 +1,170 @@ +############################################################################## +# +# Copyright (c) 2006 Zope Foundation and Contributors. +# All Rights Reserved. +# +# This software is subject to the provisions of the Zope Public License, +# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. +# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED +# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS +# FOR A PARTICULAR PURPOSE. +# +############################################################################## +"""Bootstrap a buildout-based project + +Simply run this script in a directory containing a buildout.cfg. +The script accepts buildout command-line options, so you can +use the -c option to specify an alternate configuration file. +""" + +import os +import shutil +import sys +import tempfile + +from optparse import OptionParser + +tmpeggs = tempfile.mkdtemp() + +usage = '''\ +[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options] + +Bootstraps a buildout-based project. + +Simply run this script in a directory containing a buildout.cfg, using the +Python that you want bin/buildout to use. + +Note that by using --find-links to point to local resources, you can keep +this script from going over the network. +''' + +parser = OptionParser(usage=usage) +parser.add_option("-v", "--version", help="use a specific zc.buildout version") + +parser.add_option("-t", "--accept-buildout-test-releases", + dest='accept_buildout_test_releases', + action="store_true", default=False, + help=("Normally, if you do not specify a --version, the " + "bootstrap script and buildout gets the newest " + "*final* versions of zc.buildout and its recipes and " + "extensions for you. If you use this flag, " + "bootstrap and buildout will get the newest releases " + "even if they are alphas or betas.")) +parser.add_option("-c", "--config-file", + help=("Specify the path to the buildout configuration " + "file to be used.")) +parser.add_option("-f", "--find-links", + help=("Specify a URL to search for buildout releases")) + + +options, args = parser.parse_args() + +###################################################################### +# load/install setuptools + +to_reload = False +try: + import pkg_resources + import setuptools +except ImportError: + ez = {} + + try: + from urllib.request import urlopen + except ImportError: + from urllib2 import urlopen + + # XXX use a more permanent ez_setup.py URL when available. + exec(urlopen('https://bitbucket.org/pypa/setuptools/raw/0.7.2/ez_setup.py' + ).read(), ez) + setup_args = dict(to_dir=tmpeggs, download_delay=0) + ez['use_setuptools'](**setup_args) + + if to_reload: + reload(pkg_resources) + import pkg_resources + # This does not (always?) update the default working set. We will + # do it. + for path in sys.path: + if path not in pkg_resources.working_set.entries: + pkg_resources.working_set.add_entry(path) + +###################################################################### +# Install buildout + +ws = pkg_resources.working_set + +cmd = [sys.executable, '-c', + 'from setuptools.command.easy_install import main; main()', + '-mZqNxd', tmpeggs] + +find_links = os.environ.get( + 'bootstrap-testing-find-links', + options.find_links or + ('http://downloads.buildout.org/' + if options.accept_buildout_test_releases else None) + ) +if find_links: + cmd.extend(['-f', find_links]) + +setuptools_path = ws.find( + pkg_resources.Requirement.parse('setuptools')).location + +requirement = 'zc.buildout' +version = options.version +if version is None and not options.accept_buildout_test_releases: + # Figure out the most recent final version of zc.buildout. + import setuptools.package_index + _final_parts = '*final-', '*final' + + def _final_version(parsed_version): + for part in parsed_version: + if (part[:1] == '*') and (part not in _final_parts): + return False + return True + index = setuptools.package_index.PackageIndex( + search_path=[setuptools_path]) + if find_links: + index.add_find_links((find_links,)) + req = pkg_resources.Requirement.parse(requirement) + if index.obtain(req) is not None: + best = [] + bestv = None + for dist in index[req.project_name]: + distv = dist.parsed_version + if _final_version(distv): + if bestv is None or distv > bestv: + best = [dist] + bestv = distv + elif distv == bestv: + best.append(dist) + if best: + best.sort() + version = best[-1].version +if version: + requirement = '=='.join((requirement, version)) +cmd.append(requirement) + +import subprocess +if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=setuptools_path)) != 0: + raise Exception( + "Failed to execute command:\n%s", + repr(cmd)[1:-1]) + +###################################################################### +# Import and run buildout + +ws.add_entry(tmpeggs) +ws.require(requirement) +import zc.buildout.buildout + +if not [a for a in args if '=' not in a]: + args.append('bootstrap') + +# if -c was provided, we push it back into args for buildout' main function +if options.config_file is not None: + args[0:0] = ['-c', options.config_file] + +zc.buildout.buildout.main(args) +shutil.rmtree(tmpeggs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zope.interface-4.1.0/buildout.cfg new/zope.interface-4.1.1/buildout.cfg --- old/zope.interface-4.1.0/buildout.cfg 1970-01-01 01:00:00.000000000 +0100 +++ new/zope.interface-4.1.1/buildout.cfg 2013-01-07 23:36:49.000000000 +0100 @@ -0,0 +1,14 @@ +[buildout] +develop = . +parts = test python + +[test] +recipe = zc.recipe.testrunner +eggs = zope.interface + zope.event + +[python] +recipe = zc.recipe.egg +eggs = zope.interface + zope.event +interpreter = python diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zope.interface-4.1.0/docs/_build/doctest/output.txt new/zope.interface-4.1.1/docs/_build/doctest/output.txt --- old/zope.interface-4.1.0/docs/_build/doctest/output.txt 2013-02-21 07:17:13.000000000 +0100 +++ new/zope.interface-4.1.1/docs/_build/doctest/output.txt 2013-01-07 23:40:11.000000000 +0100 @@ -1,14 +1,6 @@ -Results of doctest builder run on 2013-02-21 01:17:13 +Results of doctest builder run on 2013-01-07 17:40:11 ===================================================== -Document: human ---------------- -1 items passed all tests: - 18 tests in default -18 tests in 1 items. -18 passed and 0 failed. -Test passed. - Document: verify ---------------- 1 items passed all tests: @@ -33,6 +25,14 @@ 315 passed and 0 failed. Test passed. +Document: human +--------------- +1 items passed all tests: + 18 tests in default +18 tests in 1 items. +18 passed and 0 failed. +Test passed. + Document: README ---------------- 1 items passed all tests: Files old/zope.interface-4.1.0/docs/_build/doctrees/README.doctree and new/zope.interface-4.1.1/docs/_build/doctrees/README.doctree differ Files old/zope.interface-4.1.0/docs/_build/doctrees/README.ru.doctree and new/zope.interface-4.1.1/docs/_build/doctrees/README.ru.doctree differ Files old/zope.interface-4.1.0/docs/_build/doctrees/adapter.doctree and new/zope.interface-4.1.1/docs/_build/doctrees/adapter.doctree differ Files old/zope.interface-4.1.0/docs/_build/doctrees/adapter.ru.doctree and new/zope.interface-4.1.1/docs/_build/doctrees/adapter.ru.doctree differ Files old/zope.interface-4.1.0/docs/_build/doctrees/api.doctree and new/zope.interface-4.1.1/docs/_build/doctrees/api.doctree differ Files old/zope.interface-4.1.0/docs/_build/doctrees/environment.pickle and new/zope.interface-4.1.1/docs/_build/doctrees/environment.pickle differ Files old/zope.interface-4.1.0/docs/_build/doctrees/foodforthought.doctree and new/zope.interface-4.1.1/docs/_build/doctrees/foodforthought.doctree differ Files old/zope.interface-4.1.0/docs/_build/doctrees/hacking.doctree and new/zope.interface-4.1.1/docs/_build/doctrees/hacking.doctree differ Files old/zope.interface-4.1.0/docs/_build/doctrees/human.doctree and new/zope.interface-4.1.1/docs/_build/doctrees/human.doctree differ Files old/zope.interface-4.1.0/docs/_build/doctrees/human.ru.doctree and new/zope.interface-4.1.1/docs/_build/doctrees/human.ru.doctree differ Files old/zope.interface-4.1.0/docs/_build/doctrees/index.doctree and new/zope.interface-4.1.1/docs/_build/doctrees/index.doctree differ Files old/zope.interface-4.1.0/docs/_build/doctrees/verify.doctree and new/zope.interface-4.1.1/docs/_build/doctrees/verify.doctree differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zope.interface-4.1.0/docs/_build/html/_static/pygments.css new/zope.interface-4.1.1/docs/_build/html/_static/pygments.css --- old/zope.interface-4.1.0/docs/_build/html/_static/pygments.css 2013-02-21 07:17:12.000000000 +0100 +++ new/zope.interface-4.1.1/docs/_build/html/_static/pygments.css 2013-01-07 23:40:10.000000000 +0100 @@ -13,11 +13,11 @@ .highlight .gr { color: #FF0000 } /* Generic.Error */ .highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */ .highlight .gi { color: #00A000 } /* Generic.Inserted */ -.highlight .go { color: #333333 } /* Generic.Output */ +.highlight .go { color: #303030 } /* Generic.Output */ .highlight .gp { color: #c65d09; font-weight: bold } /* Generic.Prompt */ .highlight .gs { font-weight: bold } /* Generic.Strong */ .highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ -.highlight .gt { color: #0044DD } /* Generic.Traceback */ +.highlight .gt { color: #0040D0 } /* Generic.Traceback */ .highlight .kc { color: #007020; font-weight: bold } /* Keyword.Constant */ .highlight .kd { color: #007020; font-weight: bold } /* Keyword.Declaration */ .highlight .kn { color: #007020; font-weight: bold } /* Keyword.Namespace */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zope.interface-4.1.0/setup.cfg new/zope.interface-4.1.1/setup.cfg --- old/zope.interface-4.1.0/setup.cfg 2014-02-06 03:13:05.000000000 +0100 +++ new/zope.interface-4.1.1/setup.cfg 2014-03-19 19:34:39.000000000 +0100 @@ -1,6 +1,11 @@ +[egg_info] +tag_build = +tag_date = 0 +tag_svn_revision = 0 + [nosetests] -nocapture = 1 cover-package = zope.interface +nocapture = 1 cover-erase = 1 with-doctest = 0 where = src @@ -9,8 +14,3 @@ dev = develop easy_install zope.interface[testing] docs = easy_install zope.interface[docs] -[egg_info] -tag_build = -tag_date = 0 -tag_svn_revision = 0 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zope.interface-4.1.0/setup.py new/zope.interface-4.1.1/setup.py --- old/zope.interface-4.1.0/setup.py 2014-02-06 03:11:02.000000000 +0100 +++ new/zope.interface-4.1.1/setup.py 2014-03-19 19:33:39.000000000 +0100 @@ -112,7 +112,7 @@ ) setup(name='zope.interface', - version='4.1.0', + version='4.1.1', url='http://pypi.python.org/pypi/zope.interface', license='ZPL 2.1', description='Interfaces for Python', @@ -131,6 +131,7 @@ "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.2", "Programming Language :: Python :: 3.3", + "Programming Language :: Python :: 3.4", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Framework :: Zope3", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zope.interface-4.1.0/src/coverage.xml new/zope.interface-4.1.1/src/coverage.xml --- old/zope.interface-4.1.0/src/coverage.xml 2013-02-21 07:17:09.000000000 +0100 +++ new/zope.interface-4.1.1/src/coverage.xml 2013-01-07 23:38:25.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" ?> <!DOCTYPE coverage SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-03.dtd'> -<coverage branch-rate="0" line-rate="1" timestamp="1361427429145" version="3.6"> +<coverage branch-rate="0" line-rate="1" timestamp="1357598305235" version="3.6">  <packages> <package branch-rate="0" complexity="0" line-rate="1" name=""> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zope.interface-4.1.0/src/zope.interface.egg-info/PKG-INFO new/zope.interface-4.1.1/src/zope.interface.egg-info/PKG-INFO --- old/zope.interface-4.1.0/src/zope.interface.egg-info/PKG-INFO 2014-02-06 03:13:05.000000000 +0100 +++ new/zope.interface-4.1.1/src/zope.interface.egg-info/PKG-INFO 2014-03-19 19:34:38.000000000 +0100 @@ -1,6 +1,6 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.0 Name: zope.interface -Version: 4.1.0 +Version: 4.1.1 Summary: Interfaces for Python Home-page: http://pypi.python.org/pypi/zope.interface Author: Zope Foundation and Contributors @@ -25,6 +25,12 @@ ``zope.interface Changelog`` ============================ + 4.1.1 (2014-03-19) + ------------------ + + - Added support for Python 3.4. + + 4.1.0 (2014-02-05) ------------------ @@ -423,6 +429,7 @@ Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.2 Classifier: Programming Language :: Python :: 3.3 +Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: Python :: Implementation :: PyPy Classifier: Framework :: Zope3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zope.interface-4.1.0/src/zope.interface.egg-info/SOURCES.txt new/zope.interface-4.1.1/src/zope.interface.egg-info/SOURCES.txt --- old/zope.interface-4.1.0/src/zope.interface.egg-info/SOURCES.txt 2014-02-06 03:13:05.000000000 +0100 +++ new/zope.interface-4.1.1/src/zope.interface.egg-info/SOURCES.txt 2014-03-19 19:34:39.000000000 +0100 @@ -1,10 +1,15 @@ +.gitignore +.travis.yml CHANGES.rst COPYRIGHT.txt LICENSE.txt MANIFEST.in README.rst +bootstrap.py +buildout.cfg setup.cfg setup.py +tox.ini docs/Makefile docs/README.rst docs/README.ru.rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zope.interface-4.1.0/tox.ini new/zope.interface-4.1.1/tox.ini --- old/zope.interface-4.1.0/tox.ini 1970-01-01 01:00:00.000000000 +0100 +++ new/zope.interface-4.1.1/tox.ini 2014-03-18 20:52:43.000000000 +0100 @@ -0,0 +1,38 @@ +[tox] +envlist = +# Jython support pending 2.7 support, due 2012-07-15 or so. See: +# http://fwierzbicki.blogspot.com/2012/03/adconion-to-fund-jython-27.html +# py26,py27,py32,jython,pypy,coverage + py26,py27,py32,py33,py34,pypy,coverage,docs + +[testenv] +commands = + python setup.py test -q +deps = zope.event + +[testenv:jython] +commands = + jython setup.py test -q + +[testenv:py32] +deps = zope.event + +[testenv:coverage] +basepython = + python2.7 +commands = + nosetests --with-xunit --with-xcoverage +deps = + nose + coverage + nosexcover + +[testenv:docs] +basepython = + python2.7 +commands = + sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html + sphinx-build -b doctest -d docs/_build/doctrees docs docs/_build/doctest +deps = + Sphinx + repoze.sphinx.autointerface -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xdg-utils for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package xdg-utils for openSUSE:Factory checked in at 2014-09-28 19:57:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdg-utils (Old) and /work/SRC/openSUSE:Factory/.xdg-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xdg-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/xdg-utils/xdg-utils.changes 2014-07-31 21:50:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xdg-utils.new/xdg-utils.changes 2014-09-28 19:58:00.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Sep 23 16:32:40 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 20140922: + * Initial support for Plasma5 + * XFCE .desktop file created for browser selection is broken + (fdo#56092) + * Unnecessary filtering file:// for pcmanfm (fdo#63153) + * fails if user sets a custom IFS environment variable + (fdo#81386) + * xdg-utils-common is broken, xdg-open uses bashism (fdo#83979) + * xdg-email: do not encode - character + +------------------------------------------------------------------- Old: ---- xdg-utils-20140630.tar.xz New: ---- xdg-utils-20140922.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdg-utils.spec ++++++ --- /var/tmp/diff_new_pack.NdHuqB/_old 2014-09-28 19:58:01.000000000 +0200 +++ /var/tmp/diff_new_pack.NdHuqB/_new 2014-09-28 19:58:01.000000000 +0200 @@ -25,7 +25,7 @@ Summary: Utilities to uniformly interface desktop environments License: MIT Group: System/GUI/Other -Version: 20140630 +Version: 20140922 Release: 0 BuildArch: noarch Url: http://portland.freedesktop.org/ ++++++ install-some-more-scripts.diff ++++++ --- /var/tmp/diff_new_pack.NdHuqB/_old 2014-09-28 19:58:02.000000000 +0200 +++ /var/tmp/diff_new_pack.NdHuqB/_new 2014-09-28 19:58:02.000000000 +0200 @@ -23,4 +23,4 @@ -# xdg-terminal MANPAGES= $(SCRIPTS:%=man/%.1) - WEBPAGES= $(SCRIPTS:%=%.html) + WEBPAGES= $(SCRIPTS:%=html/%.html) ++++++ xdg-utils-20140630.tar.xz -> xdg-utils-20140922.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140630/ChangeLog new/xdg-utils-20140922/ChangeLog --- old/xdg-utils-20140630/ChangeLog 2014-07-01 13:45:18.000000000 +0200 +++ new/xdg-utils-20140922/ChangeLog 2014-09-23 18:34:19.000000000 +0200 @@ -1,5 +1,19 @@ === xdg-utils 1.1.x === +2014-09-22 Rex Dieter <rdieter(a)fedoraproject.org> + * Initial support for Plasma5 (largely thanks to Karol Herbst) + +2014-09-19 Rex Dieter <rdieter(a)fedoraproject.org> + * XFCE .desktop file created for browser selection is broken (BR56092) + * Unnecessary filtering file:// for pcmanfm (BR63153) + * fails if user sets a custom IFS environment variable (BR81386) + +2014-09-17 Rex Dieter <rdieter(a)fedoraproject.org> + * xdg-utils-common is broken, xdg-open uses bashism (BR83979) + +2014-08-25 Rex Dieter <rdieter(a)fedoraproject.org> + * xdg-email: do not encode - character + 2014-04-26 Rex Dieter <rdieter(a)fedoraproject.org> * xdg-open fails to open web browser urls with a query string (BR45857) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140630/Makefile.in new/xdg-utils-20140922/Makefile.in --- old/xdg-utils-20140630/Makefile.in 2014-07-01 13:45:18.000000000 +0200 +++ new/xdg-utils-20140922/Makefile.in 2014-09-23 18:34:19.000000000 +0200 @@ -10,7 +10,7 @@ rm -f config.* Makefile rm -rf autom4te.cache -release: $(SUBDIRS:%=%/__release__) distclean +release: $(SUBDIRS:%=%/__release__) rm -f *~ help: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140630/RELEASE_NOTES new/xdg-utils-20140922/RELEASE_NOTES --- old/xdg-utils-20140630/RELEASE_NOTES 2014-07-01 13:45:18.000000000 +0200 +++ new/xdg-utils-20140922/RELEASE_NOTES 2014-09-23 18:34:19.000000000 +0200 @@ -2,7 +2,7 @@ ================================= This release includes: -* better support for GNOME3, KDE4, LXDE, MATE, XFCE +* better support for GNOME3, KDE4, Plasma5, LXDE, MATE, XFCE * initial support for generic methods (non toolkit-specific, experimental) * xdg-settings utility, a script to get various settings from the desktop environment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140630/scripts/Makefile.in new/xdg-utils-20140922/scripts/Makefile.in --- old/xdg-utils-20140630/scripts/Makefile.in 2014-07-01 13:45:18.000000000 +0200 +++ new/xdg-utils-20140922/scripts/Makefile.in 2014-09-23 18:34:19.000000000 +0200 @@ -27,30 +27,29 @@ # xdg-terminal MANPAGES= $(SCRIPTS:%=man/%.1) -WEBPAGES= $(SCRIPTS:%=%.html) +WEBPAGES= $(SCRIPTS:%=html/%.html) XMLFILES= $(SCRIPTS:%=desc/%.xml) all: html man scripts -html: index.html $(WEBPAGES) +html: html/index.html $(WEBPAGES) scripts: README $(SCRIPTS) man: $(MANPAGES) release: scripts html man - rm -f xdg-*.in *~ HACKING generate-help-script.awk - rm -rf desc/ - rm -rf xsl/ + rm -f *~ + #rm -rf desc/ xsl/ rm -f xdg-file-dialog xdg-su xdg-copy xdg-terminal -distclean: clean - rm -f Makefile +distclean: clean + rm -f Makefile man/xdg-*.1 html/xdg-*.html clean: scripts-clean scripts-clean: - rm -f $(SCRIPTS) README man/xdg-*.1 html/xdg-*.html + rm -f $(SCRIPTS) README README: $(SCRIPTS) echo > $@ @@ -103,12 +102,12 @@ man/%.1: desc/%.xml (cd man;$(XMLTO) man ../$<) -index.html: $(XMLFILES) +html/index.html: $(XMLFILES) (cat html/index.html.pre; \ xsltproc xsl/refentry2htmlindex.xsl $(XMLFILES); \ cat html/index.html.post ) > html/index.html -%.html: desc/%.xml +html/%.html: desc/%.xml (cd html;$(XMLTO) html-nochunks ../$<) %.txt: desc/%.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140630/scripts/xdg-email.in new/xdg-utils-20140922/scripts/xdg-email.in --- old/xdg-utils-20140630/scripts/xdg-email.in 2014-07-01 13:45:18.000000000 +0200 +++ new/xdg-utils-20140922/scripts/xdg-email.in 2014-09-23 18:34:19.000000000 +0200 @@ -85,8 +85,13 @@ open_kde() { local client kde_email_profile_name - kde_email_profile_name=`kreadconfig --file emaildefaults --group Defaults --key Profile` - client=`kreadconfig --file emaildefaults --group PROFILE_"$kde_email_profile_name" --key EmailClient | cut -d ' ' -f 1` + if [ x"${KDE_SESSION_VERSION}" = x"5" ]; then + kde_email_profile_name=`kreadconfig5 --file emaildefaults --group Defaults --key Profile` + client=`kreadconfig5 --file emaildefaults --group PROFILE_"$kde_email_profile_name" --key EmailClient | cut -d ' ' -f 1` + else + kde_email_profile_name=`kreadconfig --file emaildefaults --group Defaults --key Profile` + client=`kreadconfig --file emaildefaults --group PROFILE_"$kde_email_profile_name" --key EmailClient | cut -d ' ' -f 1` + fi echo $client | grep thunderbird > /dev/null 2>&1 if [ $? -eq 0 ] ; then run_thunderbird "$client" "$1" @@ -207,6 +212,9 @@ url_encode() { +# The shell needs the default internal field separator +# otherwise it would search for $utf8 as a command in whole. +IFS=" " str=$(echo "$1" | $utf8) local ORIG_LANG="$LANG" local ORIG_LC_ALL="$LC_ALL" @@ -226,7 +234,7 @@ c = substr ($0, i, 1) if ( ord [c] > 127 ) { e = e "%" sprintf("%02X", ord [c]) - } else if ( c ~ /[(a)a-zA-Z0-9.-\\\/]/ ) { + } else if ( c ~ /[(a)a-zA-Z0-9.\-\\\/]/ ) { e = e c } else { e = e "%" sprintf("%02X", ord [c]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140630/scripts/xdg-mime.in new/xdg-utils-20140922/scripts/xdg-mime.in --- old/xdg-utils-20140630/scripts/xdg-mime.in 2014-07-01 13:45:18.000000000 +0200 +++ new/xdg-utils-20140922/scripts/xdg-mime.in 2014-09-23 18:34:19.000000000 +0200 @@ -36,11 +36,7 @@ detectDE if [ x"$DE" = x"kde" ] ; then DEBUG 1 "Running kbuildsycoca" - if [ x"$KDE_SESSION_VERSION" = x"4" ]; then - eval 'kbuildsycoca4'$xdg_redirect_output - else - eval 'kbuildsycoca'$xdg_redirect_output - fi + eval 'kbuildsycoca${KDE_SESSION_VERSION}'$xdg_redirect_output fi fi for x in `echo "$PATH:/opt/gnome/bin" | sed 's/:/ /g'`; do @@ -54,9 +50,17 @@ info_kde() { - if [ x"$KDE_SESSION_VERSION" = x"4" ]; then - DEBUG 1 "Running kmimetypefinder \"$1\"" - kmimetypefinder "$1" 2>/dev/null | head -n 1 + if [ -n "${KDE_SESSION_VERSION}" ]; then + case "${KDE_SESSION_VERSION}" in + 4) + DEBUG 1 "Running kmimetypefinder \"$1\"" + kmimetypefinder "$1" 2>/dev/null | head -n 1 + ;; + 5) + DEBUG 1 "Running kmimetypefinder${KDE_SESSION_VERSION} \"$1\"" + kmimetypefinder${KDE_SESSION_VERSION} "$1" 2>/dev/null | head -n 1 + ;; + esac else DEBUG 1 "Running kfile \"$1\"" kfile "$1" 2> /dev/null | head -n 1 | cut -d "(" -f 2 | cut -d ")" -f 1 @@ -394,10 +398,20 @@ defapp_kde() { MIME="$1" - if [ x"$KDE_SESSION_VERSION" = x"4" ]; then - KTRADER=`which ktraderclient 2> /dev/null` - MIMETYPE="--mimetype" - SERVICETYPE="--servicetype" + + if [ -n "${KDE_SESSION_VERSION}" ]; then + case "${KDE_SESSION_VERSION}" in + 4) + KTRADER=`which ktraderclient 2> /dev/null` + MIMETYPE="--mimetype" + SERVICETYPE="--servicetype" + ;; + 5) + KTRADER=`which ktraderclient${KDE_SESSION_VERSION} 2> /dev/null` + MIMETYPE="--mimetype" + SERVICETYPE="--servicetype" + ;; + esac else KTRADER=`which ktradertest 2> /dev/null` fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140630/scripts/xdg-open.in new/xdg-utils-20140922/scripts/xdg-open.in --- old/xdg-utils-20140630/scripts/xdg-open.in 2014-07-01 13:45:18.000000000 +0200 +++ new/xdg-utils-20140922/scripts/xdg-open.in 2014-09-23 18:34:19.000000000 +0200 @@ -54,7 +54,7 @@ desktop_entry="y" ;; # Reset match flag for other groups - [*) + "["*) desktop_entry="" ;; *) @@ -81,15 +81,18 @@ open_kde() { - if kde-open -v 2>/dev/null 1>&2; then - kde-open "$1" + if [ -n "${KDE_SESSION_VERSION}" ]; then + case "${KDE_SESSION_VERSION}" in + 4) + kde-open "$1" + ;; + 5) + kde-open${KDE_SESSION_VERSION} "$1" + ;; + esac else - if [ x"$KDE_SESSION_VERSION" = x"4" ]; then - kfmclient openURL "$1" - else - kfmclient exec "$1" - kfmclient_fix_exit_code $? - fi + kfmclient exec "$1" + kfmclient_fix_exit_code $? fi if [ $? -eq 0 ]; then @@ -306,10 +309,10 @@ if (echo "$1" | grep -q '^file://' || ! echo "$1" | egrep -q '^[[:alpha:]+\.\-]+:') then - local file="$(echo "$1" | sed 's%^file://%%')" + local file="$1" # handle relative paths - if ! echo "$file" | grep -q '^/'; then + if ! echo "$file" | egrep -q '^(file://)?/'; then file="$(pwd)/$file" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140630/scripts/xdg-settings.in new/xdg-utils-20140922/scripts/xdg-settings.in --- old/xdg-utils-20140630/scripts/xdg-settings.in 2014-07-01 13:45:18.000000000 +0200 +++ new/xdg-utils-20140922/scripts/xdg-settings.in 2014-09-23 18:34:19.000000000 +0200 @@ -146,10 +146,15 @@ configfile="$1" configsection="$2" configkey="$3" - application="`kreadconfig --file $configfile --group $configsection --key $configkey`" + if [ x"${KDE_SESSION_VERSION}" = x"5" ]; then + application="`kreadconfig5 --file $configfile --group $configsection --key $configkey`" + else + application="`kreadconfig --file $configfile --group $configsection --key $configkey`" + fi if [ x"$application" != x ]; then echo "$application" else + if [ x"${KDE_SESSION_VERSION}" = x"4" ]; then # kreadconfig in KDE 4 may not notice Key[$*]=... localized settings, so # check by hand if it didn't find anything (oddly kwriteconfig works # fine though). @@ -158,6 +163,7 @@ [ ! -f "$configfile_path" ] && return # This will only take the first value if there is more than one. grep "^$configkey"'\[$[^]=]*\]=' "$configfile_path" | head -n 1 | cut -d= -f 2- + fi fi } @@ -239,7 +245,11 @@ set_browser_kde() { set_browser_mime "$1" || return - kwriteconfig --file kdeglobals --group General --key BrowserApplication "$1" + if [ x"${KDE_SESSION_VERSION}" = x"5" ]; then + kwriteconfig5 --file kdeglobals --group General --key BrowserApplication "$1" + else + kwriteconfig --file kdeglobals --group General --key BrowserApplication "$1" + fi } # }}} KDE @@ -407,13 +417,15 @@ # Found a file to convert. target="${XDG_DATA_HOME:-$HOME/.local/share}/xfce4/helpers" mkdir -p "$target" - grep -v "^Type=" "$file" > "$target/$1" - echo "Type=X-XFCE-Helper" >> "$target/$1" + # Copy file up to first "Exec=" line. + sed -e 's/^Type=.*/Type=X-XFCE-Helper/' -e '/^Exec[=[]/,$d' "$file" > "$target/$1" echo "X-XFCE-Category=WebBrowser" >> "$target/$1" # Change %F, %f, %U, and %u to "%s". - command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | sed -e 's/%[FfUu]/"%s"/g'`" + command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | sed -e 's/%[FfUu]/"%s"/g' | head -1`" echo "X-XFCE-Commands=`echo "$command" | first_word`" >> "$target/$1" echo "X-XFCE-CommandsWithParameter=$command" >> "$target/$1" + # Copy rest of file (from first "Exec=" line to end-of-file). + sed -n -e 's/^Type=.*/Type=X-XFCE-Helper/' -e '/^Exec[=[]/,$p' "$file" >> "$target/$1" return fi done @@ -514,7 +526,11 @@ set_browser_mime "$2" "x-scheme-handler/$1" || return if [ "$1" = "mailto" ]; then binary="`desktop_file_to_binary "$2"`" - kwriteconfig --file emaildefaults --group PROFILE_Default --key EmailClient "$binary" + if [ x"${KDE_SESSION_VERSION}" = x"5" ]; then + kwriteconfig5 --file emaildefaults --group PROFILE_Default --key EmailClient "$binary" + else + kwriteconfig --file emaildefaults --group PROFILE_Default --key EmailClient "$binary" + fi fi } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140630/scripts/xdg-utils-common.in new/xdg-utils-20140922/scripts/xdg-utils-common.in --- old/xdg-utils-20140630/scripts/xdg-utils-common.in 2014-07-01 13:45:18.000000000 +0200 +++ new/xdg-utils-20140922/scripts/xdg-utils-common.in 2014-09-23 18:34:19.000000000 +0200 @@ -227,7 +227,7 @@ ;; --version) - echo "@NAME@ 1.1.0 rc1" + echo "@NAME@ 1.1.0 rc3" exit_success ;; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140630/tests/Makefile.in new/xdg-utils-20140922/tests/Makefile.in --- old/xdg-utils-20140630/tests/Makefile.in 2014-07-01 13:45:18.000000000 +0200 +++ new/xdg-utils-20140922/tests/Makefile.in 2014-09-23 18:34:19.000000000 +0200 @@ -15,7 +15,7 @@ all: release: - rm -rf xdg-su tmp + rm -rf tmp rm -f xdg-test.log *~ test: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit systemd for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2014-09-28 19:56:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2014-09-20 15:51:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2014-09-28 19:56:57.000000000 +0200 @@ -1,0 +2,55 @@ +Fri Sep 26 16:11:10 UTC 2014 - werner(a)suse.de + +- Add upstream patch + 0001-systemd-tmpfiles-Fix-IGNORE_DIRECTORY_PATH-age-handl.patch + for bsc#893797 + +------------------------------------------------------------------- +Fri Sep 26 09:34:22 UTC 2014 - rmilasan(a)suse.com + +- Drop renaming virtual interfaces in a guest (bnc#898432). + Add 1088-drop-renaming-of-virtual-interfaces-in-guest.patch + +------------------------------------------------------------------- +Thu Sep 25 14:08:35 UTC 2014 - werner(a)suse.de + +- Rename patch 0001-infinit-timeout-for-kmod-loaded-modules.patch + to patch 1087-infinit-timeout-for-kmod-loaded-modules.patch + and apply this one + +------------------------------------------------------------------- +Thu Sep 25 13:45:46 UTC 2014 - werner(a)suse.de + +- Change patch + 0003-mount-order-options-before-other-arguments-to-mount.patch + to fix bsc#898240 + +------------------------------------------------------------------- +Thu Sep 25 09:06:14 UTC 2014 - werner(a)suse.de + +- Add upstream patches + 0001-Fix-warning-about-unused-variable-with-SELINUX.patch + 0002-bus-remove-unused-check.patch + +------------------------------------------------------------------- +Wed Sep 24 15:05:49 UTC 2014 - werner(a)suse.de + +- Add patch 0001-infinit-timeout-for-kmod-loaded-modules.patch to + be able to avoid killing a running kmod/modprobe (bnc#889297) + +------------------------------------------------------------------- +Wed Sep 24 08:36:42 UTC 2014 - werner(a)suse.de + +- Update patch 0001-bnc888612-logind-polkit-acpi.patch + +------------------------------------------------------------------- +Wed Sep 24 07:47:54 UTC 2014 - werner(a)suse.de + +- Add upstream patches + 0001-login-pause-devices-before-acknowledging-VT-switches.patch + May help that history of the shell is saved + 0001-nspawn-don-t-try-to-create-veth-link-with-too-long-i.patch + 0001-socket-introduce-SELinuxContextFromNet-option.patch (bsc#897801) + 0002-util-avoid-non-portable-__WORDSIZE.patch + +------------------------------------------------------------------- systemd.changes: same change New: ---- 0001-Fix-warning-about-unused-variable-with-SELINUX.patch 0001-login-pause-devices-before-acknowledging-VT-switches.patch 0001-nspawn-don-t-try-to-create-veth-link-with-too-long-i.patch 0001-socket-introduce-SELinuxContextFromNet-option.patch 0001-systemd-tmpfiles-Fix-IGNORE_DIRECTORY_PATH-age-handl.patch 0002-bus-remove-unused-check.patch 0002-util-avoid-non-portable-__WORDSIZE.patch 1087-infinit-timeout-for-kmod-loaded-modules.patch 1088-drop-renaming-of-virtual-interfaces-in-guest.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.zqashz/_old 2014-09-28 19:57:02.000000000 +0200 +++ /var/tmp/diff_new_pack.zqashz/_new 2014-09-28 19:57:02.000000000 +0200 @@ -888,6 +888,20 @@ Patch429: 0006-shared-sparse-endian.h-add-missing-byteswap.h-includ.patch # PATCH-FIX-SUSE AUDIT-0: Power button press at gdm login should not prompt for credentials (bnc#888612) Patch430: 0001-bnc888612-logind-polkit-acpi.patch +# PATCH-FIX-UPSTREAM added at 2014/09/24 -- May help that history of the shell is saved +Patch431: 0001-login-pause-devices-before-acknowledging-VT-switches.patch +# PATCH-FIX-UPSTREAM added at 2014/09/24 +Patch432: 0001-nspawn-don-t-try-to-create-veth-link-with-too-long-i.patch +# PATCH-FIX-UPSTREAM added at 2014/09/24 (bsc#897801) +Patch433: 0001-socket-introduce-SELinuxContextFromNet-option.patch +# PATCH-FIX-UPSTREAM added at 2014/09/24 +Patch434: 0002-util-avoid-non-portable-__WORDSIZE.patch +# PATCH-FIX-UPSTREAM added at 2014/09/25 +Patch435: 0001-Fix-warning-about-unused-variable-with-SELINUX.patch +# PATCH-FIX-UPSTREAM added at 2014/09/25 +Patch436: 0002-bus-remove-unused-check.patch +# PATCH-FIX-UPSTREAM added at 2014/09/26 +Patch437: 0001-systemd-tmpfiles-Fix-IGNORE_DIRECTORY_PATH-age-handl.patch # UDEV PATCHES # ============ @@ -1067,6 +1081,10 @@ Patch1085: 1085-udev-fix-typos.patch # PATCH-FIX-UPSTREAM 1085-udevd-don-t-fail-if-run-udev-exists.patch Patch1086: 1086-udevd-don-t-fail-if-run-udev-exists.patch +# PATCH-FIX-SSUE 1087-infinit-timeout-for-kmod-loaded-modules.patch +Patch1087: 1087-infinit-timeout-for-kmod-loaded-modules.patch +# PATCH-FIX-SSUE 1088-drop-renaming-of-virtual-interfaces-in-guest.patch (bnc#898432) +Patch1088: 1088-drop-renaming-of-virtual-interfaces-in-guest.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1658,6 +1676,13 @@ %patch428 -p0 %patch429 -p0 %patch430 -p1 +%patch431 -p0 +%patch432 -p0 +%patch433 -p0 +%patch434 -p0 +%patch435 -p0 +%patch436 -p0 +%patch437 -p0 # udev patches %patch1001 -p1 @@ -1775,6 +1800,8 @@ %patch1084 -p0 %patch1085 -p0 %patch1086 -p0 +%patch1087 -p0 +%patch1088 -p1 # remove patch backups find -name '*.orig' -exec rm -f '{}' \+ ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.zqashz/_old 2014-09-28 19:57:02.000000000 +0200 +++ /var/tmp/diff_new_pack.zqashz/_new 2014-09-28 19:57:02.000000000 +0200 @@ -883,6 +883,20 @@ Patch429: 0006-shared-sparse-endian.h-add-missing-byteswap.h-includ.patch # PATCH-FIX-SUSE AUDIT-0: Power button press at gdm login should not prompt for credentials (bnc#888612) Patch430: 0001-bnc888612-logind-polkit-acpi.patch +# PATCH-FIX-UPSTREAM added at 2014/09/24 -- May help that history of the shell is saved +Patch431: 0001-login-pause-devices-before-acknowledging-VT-switches.patch +# PATCH-FIX-UPSTREAM added at 2014/09/24 +Patch432: 0001-nspawn-don-t-try-to-create-veth-link-with-too-long-i.patch +# PATCH-FIX-UPSTREAM added at 2014/09/24 (bsc#897801) +Patch433: 0001-socket-introduce-SELinuxContextFromNet-option.patch +# PATCH-FIX-UPSTREAM added at 2014/09/24 +Patch434: 0002-util-avoid-non-portable-__WORDSIZE.patch +# PATCH-FIX-UPSTREAM added at 2014/09/25 +Patch435: 0001-Fix-warning-about-unused-variable-with-SELINUX.patch +# PATCH-FIX-UPSTREAM added at 2014/09/25 +Patch436: 0002-bus-remove-unused-check.patch +# PATCH-FIX-UPSTREAM added at 2014/09/26 +Patch437: 0001-systemd-tmpfiles-Fix-IGNORE_DIRECTORY_PATH-age-handl.patch # UDEV PATCHES # ============ @@ -1062,6 +1076,10 @@ Patch1085: 1085-udev-fix-typos.patch # PATCH-FIX-UPSTREAM 1085-udevd-don-t-fail-if-run-udev-exists.patch Patch1086: 1086-udevd-don-t-fail-if-run-udev-exists.patch +# PATCH-FIX-SSUE 1087-infinit-timeout-for-kmod-loaded-modules.patch +Patch1087: 1087-infinit-timeout-for-kmod-loaded-modules.patch +# PATCH-FIX-SSUE 1088-drop-renaming-of-virtual-interfaces-in-guest.patch (bnc#898432) +Patch1088: 1088-drop-renaming-of-virtual-interfaces-in-guest.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1653,6 +1671,13 @@ %patch428 -p0 %patch429 -p0 %patch430 -p1 +%patch431 -p0 +%patch432 -p0 +%patch433 -p0 +%patch434 -p0 +%patch435 -p0 +%patch436 -p0 +%patch437 -p0 # udev patches %patch1001 -p1 @@ -1770,6 +1795,8 @@ %patch1084 -p0 %patch1085 -p0 %patch1086 -p0 +%patch1087 -p0 +%patch1088 -p1 # remove patch backups find -name '*.orig' -exec rm -f '{}' \+ ++++++ 0001-Fix-warning-about-unused-variable-with-SELINUX.patch ++++++ >From 493d521d9ffe706741665a88ea14929913ea2eaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek(a)in.waw.pl> Date: Tue, 23 Sep 2014 09:22:40 -0400 Subject: [PATCH] Fix warning about unused variable with !SELINUX src/shared/label.c:255:15: warning: unused variable 'l' [-Wunused-variable] char *l = NULL; ^ --- src/shared/label.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git src/shared/label.c src/shared/label.c index 02b41f0..b6af38d 100644 --- src/shared/label.c +++ src/shared/label.c @@ -252,9 +252,10 @@ fail: int label_get_our_label(char **label) { int r = -EOPNOTSUPP; - char *l = NULL; #ifdef HAVE_SELINUX + char *l = NULL; + r = getcon(&l); if (r < 0) return r; -- 1.7.9.2 ++++++ 0001-bnc888612-logind-polkit-acpi.patch ++++++ --- /var/tmp/diff_new_pack.zqashz/_old 2014-09-28 19:57:02.000000000 +0200 +++ /var/tmp/diff_new_pack.zqashz/_new 2014-09-28 19:57:02.000000000 +0200 @@ -5,7 +5,7 @@ Index: systemd-210/src/login/logind-action.c =================================================================== ---- systemd-210/src/login/logind-action.c +--- systemd-210.orig/src/login/logind-action.c +++ systemd-210/src/login/logind-action.c @@ -101,6 +101,11 @@ int manager_handle_action( @@ -21,7 +21,7 @@ return 0; Index: systemd-210/src/login/logind-dbus.c =================================================================== ---- systemd-210/src/login/logind-dbus.c +--- systemd-210.orig/src/login/logind-dbus.c +++ systemd-210/src/login/logind-dbus.c @@ -1469,9 +1469,11 @@ static int method_do_shutdown_or_sleep( sd_bus_error *error) { @@ -43,7 +43,7 @@ - if (multiple_sessions) { + fd = open ("/run/systemd/acpi-shutdown", O_NOFOLLOW|O_PATH|O_CLOEXEC); + if (fd >= 0) { -+ shutdown_through_acpi = ((fstat(fd,&buf) == 0) && (time(NULL) - buf.st_mtime <= 65)); ++ shutdown_through_acpi = ((fstat(fd,&buf) == 0) && (time(NULL) - buf.st_mtime <= 65) && !sleep_verb); + close(fd); + unlink ("/run/systemd/acpi-shutdown"); + } ++++++ 0001-login-pause-devices-before-acknowledging-VT-switches.patch ++++++ Based on 2ec3ff668ff03410e94cfef8e3ee9384a8222211 Mon Sep 17 00:00:00 2001 From: David Herrmann <dh.herrmann(a)gmail.com> Date: Fri, 19 Sep 2014 13:26:39 +0200 Subject: [PATCH] login: pause devices before acknowledging VT switches If a session controller does not need synchronous VT switches, we allow them to pass VT control to logind, which acknowledges all VT switches unconditionally. This works fine with all sessions using the dbus API, but causes out-of-sync device use if we switch to legacy sessions that are notified via VT signals. Those are processed before logind notices the session-switch via sysfs. Therefore, leaving the old session still active for a short amount of time. This, in fact, may cause the legacy session to prepare graphics devices before the old session was deactivated, and thus, maybe causing the old session to interfer with graphics device usage. Fix this by releasing devices immediately before acknowledging VT switches. This way, sessions without VT handlers are required to support async session switching (which they do in that case, anyway). --- src/login/logind-session.c | 21 +++++++++++++++++++++ src/login/logind-session.h | 1 + src/login/logind.c | 4 ++-- 3 files changed, 24 insertions(+), 2 deletions(-) --- src/login/logind-session.c +++ src/login/logind-session.c 2014-09-24 07:40:45.786639180 +0000 @@ -1040,6 +1040,27 @@ void session_restore_vt(Session *s) { s->vtfd = -1; } +void session_leave_vt(Session *s) { + assert(s); + + /* This is called whenever we get a VT-switch signal from the kernel. + * We acknowledge all of them unconditionally. Note that session are + * free to overwrite those handlers and we only register them for + * sessions with controllers. Legacy sessions are not affected. + * However, if we switch from a non-legacy to a legacy session, we must + * make sure to pause all device before acknowledging the switch. We + * process the real switch only after we are notified via sysfs, so the + * legacy session might have already started using the devices. If we + * don't pause the devices before the switch, we might confuse the + * session we switch to. */ + + if (s->vtfd < 0) + return; + + session_device_pause_all(s); + ioctl(s->vtfd, VT_RELDISP, 1); +} + bool session_is_controller(Session *s, const char *sender) { assert(s); --- src/login/logind-session.h +++ src/login/logind-session.h 2014-09-24 07:41:50.290236363 +0000 @@ -173,6 +173,7 @@ KillWho kill_who_from_string(const char int session_mute_vt(Session *s); void session_restore_vt(Session *s); +void session_leave_vt(Session *s); bool session_is_controller(Session *s, const char *sender); int session_set_controller(Session *s, const char *sender, bool force); --- src/login/logind.c +++ src/login/logind.c 2014-09-24 00:00:00.000000000 +0000 @@ -743,11 +743,11 @@ static int manager_vt_switch(sd_event_so } if (active->vtfd >= 0) { - ioctl(active->vtfd, VT_RELDISP, 1); + session_leave_vt(active); } else { LIST_FOREACH(sessions_by_seat, iter, m->seat0->sessions) { if (iter->vtnr == active->vtnr && iter->vtfd >= 0) { - ioctl(iter->vtfd, VT_RELDISP, 1); + session_leave_vt(iter); break; } } ++++++ 0001-nspawn-don-t-try-to-create-veth-link-with-too-long-i.patch ++++++ Based on c00524c9cc7fb498c7244350e25823b8352f078c Mon Sep 17 00:00:00 2001 From: Tom Gundersen <teg(a)jklm.no> Date: Fri, 19 Sep 2014 23:02:00 +0200 Subject: [PATCH] nspawn: don't try to create veth link with too long ifname Reported by: James Lott <james(a)lottspot.com> --- src/nspawn/nspawn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- src/nspawn/nspawn.c +++ src/nspawn/nspawn.c 2014-09-23 15:33:06.766236272 +0000 @@ -1383,7 +1383,7 @@ static int setup_veth(pid_t pid, char if /* Use two different interface name prefixes depending whether * we are in bridge mode or not. */ - snprintf(iface_name, IFNAMSIZ, "%s-%s", + snprintf(iface_name, IFNAMSIZ - 1, "%s-%s", arg_network_bridge ? "vb" : "ve", arg_machine); r = sd_rtnl_open(&rtnl, 0); ++++++ 0001-socket-introduce-SELinuxContextFromNet-option.patch ++++++ Based on 16115b0a7b7cdf08fb38084d857d572d8a9088dc Mon Sep 17 00:00:00 2001 From: Michal Sekletar <msekleta(a)redhat.com> Date: Thu, 24 Jul 2014 10:40:28 +0200 Subject: [PATCH] socket: introduce SELinuxContextFromNet option This makes possible to spawn service instances triggered by socket with MLS/MCS SELinux labels which are created based on information provided by connected peer. Implementation of label_get_child_mls_label derived from xinetd. Reviewed-by: Paul Moore <pmoore(a)redhat.com> --- man/systemd.socket.xml | 26 +++++++ src/core/execute.c | 30 +++++++-- src/core/execute.h | 1 src/core/load-fragment-gperf.gperf.m4 | 3 src/core/mount.c | 1 src/core/service.c | 4 - src/core/service.h | 3 src/core/socket.c | 16 +++- src/core/socket.h | 2 src/core/swap.c | 1 src/shared/label.c | 113 ++++++++++++++++++++++++++++++++++ src/shared/label.h | 2 12 files changed, 191 insertions(+), 11 deletions(-) --- man/systemd.socket.xml +++ man/systemd.socket.xml 2014-09-23 15:36:49.000000000 +0000 @@ -570,6 +570,32 @@ </varlistentry> <varlistentry> + <term><varname>SELinuxContextFromNet=</varname></term> + <listitem><para>Takes a boolean + argument. When true systemd will attempt + to figure out the SELinux label used + for the instantiated service from the + information handed by the peer over the + network. Note that only the security + level is used from the information + provided by the peer. Other parts of + the resulting SELinux context originate + from either the target binary that is + effectively triggered by socket unit + are taken from the value of the + <varname>SELinuxContext=</varname> + option.This configuration option only + affects sockets with + <varname>Accept=</varname> mode set to + <literal>true</literal>. Also note that + this option is useful only when + MLS/MCS SELinux policy is + deployed. Defaults to + <literal>false</literal>. + </para></listitem> + </varlistentry> + + <varlistentry> <term><varname>PipeSize=</varname></term> <listitem><para>Takes an size in bytes. Controls the pipe buffer size --- src/core/execute.c +++ src/core/execute.c 2014-09-24 09:22:08.882735864 +0000 @@ -82,6 +82,7 @@ #include "selinux-util.h" #include "errno-list.h" #include "apparmor-util.h" +#include "label.h" #ifdef HAVE_SECCOMP #include "seccomp-util.h" @@ -1123,6 +1124,7 @@ int exec_spawn(ExecCommand *command, bool apply_chroot, bool apply_tty_stdin, bool confirm_spawn, + bool selinux_context_net, CGroupControllerMask cgroup_supported, const char *cgroup_path, const char *unit_id, @@ -1594,11 +1596,29 @@ int exec_spawn(ExecCommand *command, #endif #ifdef HAVE_SELINUX - if (context->selinux_context && use_selinux()) { - err = setexeccon(context->selinux_context); - if (err < 0 && !context->selinux_context_ignore) { - r = EXIT_SELINUX_CONTEXT; - goto fail_child; + if (use_selinux()) { + if (context->selinux_context) { + err = setexeccon(context->selinux_context); + if (err < 0 && !context->selinux_context_ignore) { + r = EXIT_SELINUX_CONTEXT; + goto fail_child; + } + } + + if (selinux_context_net && socket_fd >= 0) { + _cleanup_free_ char *label = NULL; + + err = label_get_child_mls_label(socket_fd, command->path, &label); + if (err < 0) { + r = EXIT_SELINUX_CONTEXT; + goto fail_child; + } + + err = setexeccon(label); + if (err < 0) { + r = EXIT_SELINUX_CONTEXT; + goto fail_child; + } } } #endif --- src/core/execute.h +++ src/core/execute.h 2014-09-23 15:46:26.000000000 +0000 @@ -195,6 +195,7 @@ int exec_spawn(ExecCommand *command, bool apply_chroot, bool apply_tty_stdin, bool confirm_spawn, + bool selinux_context_net, CGroupControllerMask cgroup_mask, const char *cgroup_path, const char *unit_id, --- src/core/load-fragment-gperf.gperf.m4 +++ src/core/load-fragment-gperf.gperf.m4 2014-09-23 00:00:00.000000000 +0000 @@ -242,6 +242,9 @@ Socket.SmackLabelIPOut, config_ `Socket.SmackLabel, config_parse_warn_compat, 0, 0 Socket.SmackLabelIPIn, config_parse_warn_compat, 0, 0 Socket.SmackLabelIPOut, config_parse_warn_compat, 0, 0') +m4_ifdef(`HAVE_SELINUX', +`Socket.SELinuxContextFromNet, config_parse_bool, 0, offsetof(Socket, selinux_context_from_net)', +`Socket.SELinuxContextFromNet, config_parse_warn_compat, 0, 0') EXEC_CONTEXT_CONFIG_ITEMS(Socket)m4_dnl CGROUP_CONTEXT_CONFIG_ITEMS(Socket)m4_dnl KILL_CONTEXT_CONFIG_ITEMS(Socket)m4_dnl --- src/core/mount.c +++ src/core/mount.c 2014-09-24 09:16:26.234235379 +0000 @@ -785,6 +785,7 @@ static int mount_spawn(Mount *m, ExecCom true, true, UNIT(m)->manager->confirm_spawn, + false, UNIT(m)->manager->cgroup_supported, UNIT(m)->cgroup_path, UNIT(m)->id, --- src/core/service.c +++ src/core/service.c 2014-09-23 15:49:24.000000000 +0000 @@ -1856,6 +1856,7 @@ static int service_spawn( apply_chroot, apply_tty_stdin, UNIT(s)->manager->confirm_spawn, + s->socket_fd_selinux_context_net, UNIT(s)->manager->cgroup_supported, path, UNIT(s)->id, @@ -3787,7 +3788,7 @@ static void service_bus_name_owner_chang } } -int service_set_socket_fd(Service *s, int fd, Socket *sock) { +int service_set_socket_fd(Service *s, int fd, Socket *sock, bool selinux_context_net) { _cleanup_free_ char *peer = NULL; int r; @@ -3825,6 +3826,7 @@ int service_set_socket_fd(Service *s, in } s->socket_fd = fd; + s->socket_fd_selinux_context_net = selinux_context_net; unit_ref_set(&s->accept_socket, UNIT(sock)); --- src/core/service.h +++ src/core/service.h 2014-09-23 15:51:13.000000000 +0000 @@ -159,6 +159,7 @@ struct Service { pid_t main_pid, control_pid; int socket_fd; + bool socket_fd_selinux_context_net; bool permissions_start_only; bool root_directory_start_only; bool remain_after_exit; @@ -204,7 +205,7 @@ extern const UnitVTable service_vtable; struct Socket; -int service_set_socket_fd(Service *s, int fd, struct Socket *socket); +int service_set_socket_fd(Service *s, int fd, struct Socket *socket, bool selinux_context_net); const char* service_state_to_string(ServiceState i) _const_; ServiceState service_state_from_string(const char *s) _pure_; --- src/core/socket.c +++ src/core/socket.c 2014-09-24 09:13:29.698735735 +0000 @@ -453,7 +453,8 @@ static void socket_dump(Unit *u, FILE *f "%sBroadcast: %s\n" "%sPassCredentials: %s\n" "%sPassSecurity: %s\n" - "%sTCPCongestion: %s\n", + "%sTCPCongestion: %s\n" + "%sSELinuxContextFromNet: %s\n", prefix, socket_state_to_string(s->state), prefix, socket_result_to_string(s->result), prefix, socket_address_bind_ipv6_only_to_string(s->bind_ipv6_only), @@ -466,7 +467,8 @@ static void socket_dump(Unit *u, FILE *f prefix, yes_no(s->broadcast), prefix, yes_no(s->pass_cred), prefix, yes_no(s->pass_sec), - prefix, strna(s->tcp_congestion)); + prefix, strna(s->tcp_congestion), + prefix, yes_no(s->selinux_context_from_net)); if (s->control_pid > 0) fprintf(f, @@ -1000,7 +1002,12 @@ static int socket_open_fds(Socket *s) { if (p->type == SOCKET_SOCKET) { - if (!know_label) { + if (!know_label && s->selinux_context_from_net) { + r = label_get_our_label(&label); + if (r < 0) + return r; + know_label = true; + } else if (!know_label) { if ((r = socket_instantiate_service(s)) < 0) return r; @@ -1247,6 +1254,7 @@ static int socket_spawn(Socket *s, ExecC true, true, UNIT(s)->manager->confirm_spawn, + s->selinux_context_from_net, UNIT(s)->manager->cgroup_supported, UNIT(s)->cgroup_path, UNIT(s)->id, @@ -1568,7 +1576,7 @@ static void socket_enter_running(Socket unit_choose_id(UNIT(service), name); - r = service_set_socket_fd(service, cfd, s); + r = service_set_socket_fd(service, cfd, s, s->selinux_context_from_net); if (r < 0) goto fail; --- src/core/socket.h +++ src/core/socket.h 2014-09-23 15:55:17.000000000 +0000 @@ -154,6 +154,8 @@ struct Socket { char *smack; char *smack_ip_in; char *smack_ip_out; + + bool selinux_context_from_net; }; /* Called from the service code when collecting fds */ --- src/core/swap.c +++ src/core/swap.c 2014-09-24 09:17:18.438735618 +0000 @@ -642,6 +642,7 @@ static int swap_spawn(Swap *s, ExecComma true, true, UNIT(s)->manager->confirm_spawn, + false, UNIT(s)->manager->cgroup_supported, UNIT(s)->cgroup_path, UNIT(s)->id, --- src/shared/label.c +++ src/shared/label.c 2014-09-23 00:00:00.000000000 +0000 @@ -31,6 +31,7 @@ #ifdef HAVE_SELINUX #include <selinux/selinux.h> #include <selinux/label.h> +#include <selinux/context.h> #endif #include "label.h" @@ -41,6 +42,12 @@ #include "smack-util.h" #ifdef HAVE_SELINUX +DEFINE_TRIVIAL_CLEANUP_FUNC(security_context_t, freecon); +DEFINE_TRIVIAL_CLEANUP_FUNC(context_t, context_free); + +#define _cleanup_security_context_free_ _cleanup_(freeconp) +#define _cleanup_context_free_ _cleanup_(context_freep) + static struct selabel_handle *label_hnd = NULL; #endif @@ -243,6 +250,112 @@ fail: return r; } +int label_get_our_label(char **label) { + int r = -EOPNOTSUPP; + char *l = NULL; + +#ifdef HAVE_SELINUX + r = getcon(&l); + if (r < 0) + return r; + + *label = l; +#endif + + return r; +} + +int label_get_child_mls_label(int socket_fd, const char *exe, char **label) { + int r = -EOPNOTSUPP; + +#ifdef HAVE_SELINUX + + _cleanup_security_context_free_ security_context_t mycon = NULL, peercon = NULL, fcon = NULL, ret = NULL; + _cleanup_context_free_ context_t pcon = NULL, bcon = NULL; + security_class_t sclass; + + const char *range = NULL; + + assert(socket_fd >= 0); + assert(exe); + assert(label); + + r = getcon(&mycon); + if (r < 0) { + r = -EINVAL; + goto out; + } + + r = getpeercon(socket_fd, &peercon); + if (r < 0) { + r = -EINVAL; + goto out; + } + + r = getexeccon(&fcon); + if (r < 0) { + r = -EINVAL; + goto out; + } + + if (!fcon) { + /* If there is no context set for next exec let's use context + of target executable */ + r = getfilecon(exe, &fcon); + if (r < 0) { + r = -errno; + goto out; + } + } + + bcon = context_new(mycon); + if (!bcon) { + r = -ENOMEM; + goto out; + } + + pcon = context_new(peercon); + if (!pcon) { + r = -ENOMEM; + goto out; + } + + range = context_range_get(pcon); + if (!range) { + r = -errno; + goto out; + } + + r = context_range_set(bcon, range); + if (r) { + r = -errno; + goto out; + } + + freecon(mycon); + mycon = context_str(bcon); + if (!mycon) { + r = -errno; + goto out; + } + + sclass = string_to_security_class("process"); + r = security_compute_create(mycon, fcon, sclass, &ret); + if (r < 0) { + r = -EINVAL; + goto out; + } + + *label = ret; + r = 0; + +out: + if (r < 0 && security_getenforce() == 1) + return r; +#endif + return r; +} + int label_context_set(const char *path, mode_t mode) { int r = 0; --- src/shared/label.h +++ src/shared/label.h 2014-09-23 00:00:00.000000000 +0000 @@ -40,6 +40,8 @@ void label_context_clear(void); void label_free(const char *label); int label_get_create_label_from_exe(const char *exe, char **label); +int label_get_our_label(char **label); +int label_get_child_mls_label(int socket_fd, const char *exec, char **label); int label_mkdir(const char *path, mode_t mode); ++++++ 0001-systemd-tmpfiles-Fix-IGNORE_DIRECTORY_PATH-age-handl.patch ++++++ >From 9ed2a35e93f4a9e82585f860f54cdcbbdf3e1f86 Mon Sep 17 00:00:00 2001 From: Richard Weinberger <richard(a)nod.at> Date: Tue, 9 Sep 2014 11:09:37 +0200 Subject: [PATCH] systemd-tmpfiles: Fix IGNORE_DIRECTORY_PATH age handling If one has a config like: d /tmp 1777 root root - X /tmp/important_mount All files below /tmp/important_mount will be deleted as the /tmp/important_mount item will spuriously inherit a max age of 0 from /tmp. /tmp has a max age of 0 but age_set is (of course) false. This affects also the PrivateTmp feature of systemd. All tmp files of such services will be deleted unconditionally and can cause service failures and data loss. Fix this by checking ->age_set in the IGNORE_DIRECTORY_PATH logic. --- src/tmpfiles/tmpfiles.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git src/tmpfiles/tmpfiles.c src/tmpfiles/tmpfiles.c index f9830c4..7eafd6b 100644 --- src/tmpfiles/tmpfiles.c +++ src/tmpfiles/tmpfiles.c @@ -1576,7 +1576,7 @@ static int read_config_file(const char *fn, bool ignore_enoent) { candidate_item = j; } - if (candidate_item) { + if (candidate_item && candidate_item->age_set) { i->age = candidate_item->age; i->age_set = true; } -- 1.7.9.2 ++++++ 0002-bus-remove-unused-check.patch ++++++ >From 04c553e322680b6fcdf5b271e84b0b4b0ad8d5f9 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen <phomes(a)gmail.com> Date: Tue, 23 Sep 2014 21:34:21 +0200 Subject: [PATCH] bus: remove unused check strerror_r does not return null here and even if it did we would have problems already at the preceding strlen call. Found by coverity. Fixes: CID#1237770 --- src/libsystemd/sd-bus/bus-error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git src/libsystemd/sd-bus/bus-error.c src/libsystemd/sd-bus/bus-error.c index c2e41fb..abdfd73 100644 --- src/libsystemd/sd-bus/bus-error.c +++ src/libsystemd/sd-bus/bus-error.c @@ -312,7 +312,7 @@ static void bus_error_strerror(sd_bus_error *e, int error) { continue; } - if (!x || errno) { + if (errno) { free(m); return; } -- 1.7.9.2 ++++++ 0002-util-avoid-non-portable-__WORDSIZE.patch ++++++ Based on 8507eb20b64010b26f23822cbf442bb0bf96511c Mon Sep 17 00:00:00 2001 From: Emil Renner Berthing <systemd(a)esmil.dk> Date: Fri, 19 Sep 2014 20:26:53 +0200 Subject: [PATCH] util: avoid non-portable __WORDSIZE Lets not unnecessarily rely on __WORDSIZE, which is not clearly specified by any spec. Use explicit size comparisons if we're not interested in the WORDSIZE, anyway. (David: adjust commit message to explain why we do this) --- src/shared/util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- src/shared/util.h +++ src/shared/util.h 2014-09-24 06:58:11.378235669 +0000 @@ -166,7 +166,7 @@ int safe_atolli(const char *s, long long int safe_atod(const char *s, double *ret_d); -#if __WORDSIZE == 32 +#if LONG_MAX == INT_MAX static inline int safe_atolu(const char *s, unsigned long *ret_u) { assert_cc(sizeof(unsigned long) == sizeof(unsigned)); return safe_atou(s, (unsigned*) ret_u); ++++++ 0003-mount-order-options-before-other-arguments-to-mount.patch ++++++ --- /var/tmp/diff_new_pack.zqashz/_old 2014-09-28 19:57:03.000000000 +0200 +++ /var/tmp/diff_new_pack.zqashz/_new 2014-09-28 19:57:03.000000000 +0200 @@ -8,18 +8,18 @@ 1 file changed, 6 insertions(+), 4 deletions(-) --- src/core/mount.c -+++ src/core/mount.c 2014-09-19 10:13:51.638238597 +0000 ++++ src/core/mount.c 2014-09-25 13:43:44.926563278 +0000 @@ -947,10 +947,11 @@ static void mount_enter_mounting(Mount * r = exec_command_set( m->control_command, "/bin/mount", -- m->parameters_fragment.what, -- m->where, + "-n", - "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto", - m->parameters_fragment.options ? "-o" : NULL, m->parameters_fragment.options, -+ m->parameters_fragment.what, -+ m->where, ++ "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto", ++ "-o", m->parameters_fragment.options ? m->parameters_fragment.options : "defaults", + m->parameters_fragment.what, + m->where, +- "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto", +- m->parameters_fragment.options ? "-o" : NULL, m->parameters_fragment.options, NULL); else r = -ENOENT; ++++++ 1087-infinit-timeout-for-kmod-loaded-modules.patch ++++++ --- src/udev/udev-event.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/udev/udev.h | 1 + src/udev/udevd.c | 23 +++++++++++++++++++++-- 3 files changed, 64 insertions(+), 2 deletions(-) --- src/udev/udev-event.c +++ src/udev/udev-event.c 2014-09-24 14:32:53.115639820 +0000 @@ -959,6 +959,46 @@ void udev_event_execute_rules(struct ude } } +#ifdef HAVE_KMOD +static inline void udev_check_and_set_kmod(enum udev_builtin_cmd builtin_cmd, struct udev_event *event) { + char filename[UTIL_PATH_SIZE]; + switch (builtin_cmd) { + case UDEV_BUILTIN_KMOD: + snprintf(filename, sizeof(filename), "/run/udev/kmod/%u", (unsigned)getpid()); + touch(filename); + default: + break; + } +} + +static inline void udev_check_and_unset_kmod(enum udev_builtin_cmd builtin_cmd, struct udev_event *event) { + char filename[UTIL_PATH_SIZE]; + switch (builtin_cmd) { + case UDEV_BUILTIN_KMOD: + snprintf(filename, sizeof(filename), "/run/udev/kmod/%u", (unsigned)getpid()); + unlink(filename); + default: + break; + } +} + +bool udev_check_for_kmod(pid_t pid) { + char filename[UTIL_PATH_SIZE]; + struct stat st; + snprintf(filename, sizeof(filename), "/run/udev/kmod/%u", (unsigned)pid); + if (stat(filename, &st) == 0) { + return true; + } + return false; +} +#else +# define udev_set_kmod (a,b) +# define udev_unset_kmod(a,b) +bool udev_check_for_kmod(pid_t pid) { + return false; +} +#endif + void udev_event_execute_run(struct udev_event *event, usec_t timeout_usec, usec_t timeout_warn_usec, const sigset_t *sigmask) { struct udev_list_entry *list_entry; @@ -970,7 +1010,9 @@ void udev_event_execute_run(struct udev_ char command[UTIL_PATH_SIZE]; udev_event_apply_format(event, cmd, command, sizeof(command)); + udev_check_and_set_kmod(builtin_cmd, event); udev_builtin_run(event->dev, builtin_cmd, command, false); + udev_check_and_unset_kmod(builtin_cmd, event); } else { char program[UTIL_PATH_SIZE]; char **envp; --- src/udev/udevd.c +++ src/udev/udevd.c 2014-09-24 15:02:30.895592379 +0000 @@ -76,6 +76,7 @@ static int children_max; static int exec_delay; static usec_t event_timeout_usec = 180 * USEC_PER_SEC; static usec_t event_timeout_warn_usec = 180 * USEC_PER_SEC / 3; +static bool event_killkmod = false; static sigset_t sigmask_orig; static UDEV_LIST(event_list); static UDEV_LIST(worker_list); @@ -1017,6 +1018,12 @@ static void kernel_cmdline_options(struc } event_timeout_usec *= USEC_PER_SEC; event_timeout_warn_usec = (event_timeout_usec / 3) ? : 1; + } else if (startswith(opt, "udev.killkmod=")) { + r = parse_boolean(opt + 14); + if (r < 0) + log_warning("Invalid udev.killkmod Ignoring: %s", opt + 14); + else + event_killkmod = r; } free(s); @@ -1065,7 +1072,7 @@ int main(int argc, char *argv[]) { } for (;;) { - int option, r; + int option; option = getopt_long(argc, argv, "c:de:DtN:hV", options, NULL); if (option == -1) @@ -1356,6 +1363,12 @@ int main(int argc, char *argv[]) { udev_list_node_init(&event_list); udev_list_node_init(&worker_list); + r = mkdir_p("/run/udev/kmod", 0755); + if (r < 0 && errno != EEXIST) { + log_error("could not create /run/udev/kmod: %m"); + goto exit; + } + for (;;) { static usec_t last_usec; struct epoll_event ev[8]; @@ -1440,7 +1453,13 @@ int main(int argc, char *argv[]) { if (worker->state != WORKER_RUNNING) continue; - +#ifdef HAVE_KMOD + if (udev_check_for_kmod(worker->pid)) { + log_debug("worker [%u] %s is using kmod", worker->pid, worker->event->devpath); + if (!event_killkmod) + continue; + } +#endif ts = now(CLOCK_MONOTONIC); if ((ts - worker->event_start_usec) > event_timeout_warn_usec) { --- src/udev/udev.h +++ src/udev/udev.h 2014-09-24 14:33:33.824008084 +0000 @@ -88,6 +88,7 @@ int udev_event_spawn(struct udev_event * char *result, size_t ressize); void udev_event_execute_rules(struct udev_event *event, usec_t timeout_usec, usec_t timeout_warn_usec, struct udev_rules *rules, const sigset_t *sigset); +bool udev_check_for_kmod(pid_t pid); void udev_event_execute_run(struct udev_event *event, usec_t timeout_usec, usec_t timeout_warn_usec, const sigset_t *sigset); int udev_build_argv(struct udev *udev, char *cmd, int *argc, char *argv[]); ++++++ 1088-drop-renaming-of-virtual-interfaces-in-guest.patch ++++++ Index: systemd-210/src/udev/rule_generator/76-net-sriov-names.rules =================================================================== --- systemd-210.orig/src/udev/rule_generator/76-net-sriov-names.rules +++ systemd-210/src/udev/rule_generator/76-net-sriov-names.rules @@ -15,6 +15,5 @@ SUBSYSTEM=="net", SUBSYSTEMS=="pci", ACT # rename interface if needed ENV{INTERFACE_NEW}=="?*", NAME="$env{INTERFACE_NEW}" -ENV{INTERFACE_NEW}=="", DRIVERS=="cxgb4vf|igbvf|ixgbevf", NAME="vf$attr{ifindex}" LABEL="net-sriov-names_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 autoyast2 for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2014-09-28 19:56:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autoyast2" Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2014-09-25 08:42:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2014-09-28 19:56:55.000000000 +0200 @@ -1,0 +2,21 @@ +Fri Sep 26 14:24:14 CEST 2014 - schubi(a)suse.de + +- Documentation update for SLES12. +- 3.1.64 + +------------------------------------------------------------------- +Wed Sep 24 18:27:58 CEST 2014 - schubi(a)suse.de + +- Exporting package selection correctly. + (bnc#897404) +- 3.1.63 + +------------------------------------------------------------------- +Wed Sep 24 11:24:39 CEST 2014 - schubi(a)suse.de + +- Fixed path of change-root scripts which have been + defined in autoinst.xml. + (bnc#897212) +- 3.1.62 + +------------------------------------------------------------------- Old: ---- autoyast2-3.1.61.tar.bz2 New: ---- autoyast2-3.1.64.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.pVrN9D/_old 2014-09-28 19:56:56.000000000 +0200 +++ /var/tmp/diff_new_pack.pVrN9D/_new 2014-09-28 19:56:56.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.61 +Version: 3.1.64 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-3.1.61.tar.bz2 -> autoyast2-3.1.64.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.61/package/autoyast2.changes new/autoyast2-3.1.64/package/autoyast2.changes --- old/autoyast2-3.1.61/package/autoyast2.changes 2014-09-23 16:39:11.000000000 +0200 +++ new/autoyast2-3.1.64/package/autoyast2.changes 2014-09-26 14:59:11.000000000 +0200 @@ -1,4 +1,25 @@ ------------------------------------------------------------------- +Fri Sep 26 14:24:14 CEST 2014 - schubi(a)suse.de + +- Documentation update for SLES12. +- 3.1.64 + +------------------------------------------------------------------- +Wed Sep 24 18:27:58 CEST 2014 - schubi(a)suse.de + +- Exporting package selection correctly. + (bnc#897404) +- 3.1.63 + +------------------------------------------------------------------- +Wed Sep 24 11:24:39 CEST 2014 - schubi(a)suse.de + +- Fixed path of change-root scripts which have been + defined in autoinst.xml. + (bnc#897212) +- 3.1.62 + +------------------------------------------------------------------- Tue Sep 23 15:51:13 CEST 2014 - schubi(a)suse.de - Finishing the autoyast-initscripts.service BEFORE the user can diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.61/package/autoyast2.spec new/autoyast2-3.1.64/package/autoyast2.spec --- old/autoyast2-3.1.61/package/autoyast2.spec 2014-09-23 16:39:11.000000000 +0200 +++ new/autoyast2-3.1.64/package/autoyast2.spec 2014-09-26 14:59:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.61 +Version: 3.1.64 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Files old/autoyast2-3.1.61/package/autoyast_en_html.tar.bz2 and new/autoyast2-3.1.64/package/autoyast_en_html.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.61/src/modules/AutoinstScripts.rb new/autoyast2-3.1.64/src/modules/AutoinstScripts.rb --- old/autoyast2-3.1.61/src/modules/AutoinstScripts.rb 2014-09-23 16:39:11.000000000 +0200 +++ new/autoyast2-3.1.64/src/modules/AutoinstScripts.rb 2014-09-26 14:59:11.000000000 +0200 @@ -824,8 +824,15 @@ # special == true ---> The script has to be installed into /mnt # because it will be called in a chroot environment. # (bnc#889931) + # Add /mnt only if the script is getting via GetURL. + # In the other case SCR will do it via target setting. + # (bnc#897212) + # # FIXME: Find out why "nfs" has a special behavior. - if special || toks["scheme"] == "nfs" + # Take another name for "s" + if (special && s["location"] && !s["location"].empty?) || + toks["scheme"] == "nfs" + scriptPath = Builtins.sformat( "%1%2/%3", AutoinstConfig.destdir, @@ -856,7 +863,10 @@ Ops.get_string(s, "source", "echo Empty script!") ) end - if special || toks["scheme"] == "nfs" + # FIXME: That's duplicate code + if (special && s["location"] && !s["location"].empty?) || + toks["scheme"] == "nfs" + scriptPath = scriptPath[AutoinstConfig.destdir.length..-1] # cut off the e.g. /mnt for later execution end else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.61/src/modules/AutoinstSoftware.rb new/autoyast2-3.1.64/src/modules/AutoinstSoftware.rb --- old/autoyast2-3.1.61/src/modules/AutoinstSoftware.rb 2014-09-23 16:39:11.000000000 +0200 +++ new/autoyast2-3.1.64/src/modules/AutoinstSoftware.rb 2014-09-26 14:59:11.000000000 +0200 @@ -950,6 +950,33 @@ packages.map! {|p| p["name"] } end + def install_packages + # user selected packages which have not been already installed + packages = Pkg.FilterPackages( + solver_selected = false, + app_selected = true, + user_selected = true, + name_only = true) + + # user selected packages which have already been installed + installed_by_user = Pkg.GetPackages(:installed, true).select{ |pkg_name| + Pkg.PkgPropertiesAll(pkg_name).any? { |package| package["on_system_by_user"] } + } + + # Filter out kernel and pattern packages + kernel_packages = Pkg.PkgQueryProvides("kernel").collect { |package| + package[0] + }.compact.uniq + pattern_packages = Pkg.PkgQueryProvides("pattern()").collect { |package| + package[0] + }.compact.uniq + + (packages + installed_by_user).uniq.select{ |pkg_name| + !kernel_packages.include?(pkg_name) && + !pattern_packages.include?(pkg_name) + } + end + # Return list of software packages of calling client # in the installed environment # @return [Hash] map of installed software package @@ -957,15 +984,14 @@ # "packages" -> list<string> user selected packages # "remove-packages" -> list<string> packages to remove def ReadHelper - ret = Pkg.TargetInit("/", false) - # Pkg::TargetInitialize ("/"); + Pkg.TargetInit("/", false) Pkg.TargetLoad Pkg.SourceStartManager(true) Pkg.PkgSolve(false) - @inst = Pkg.GetPackages(:installed, true) all_patterns = Pkg.ResolvableProperties("", :pattern, "") @all_xpatterns = Pkg.ResolvableDependencies("", :pattern, "") + to_install_packages = install_packages patterns = [] patternsFullData = Builtins.filter(all_patterns) do |p| @@ -988,10 +1014,7 @@ Builtins.y2debug("SourceStartCache: %1", Pkg.SourceStartCache(false)) Pkg.SourceStartManager(true) - - userpackages = Pkg.FilterPackages(false, false, true, true) Pkg.TargetFinish - # Remove kernel packages patternPackages = [] new_p = [] @@ -1006,10 +1029,6 @@ if Ops.get_string(d, "res_kind", "") == "package" && (Ops.get_string(d, "dep_kind", "") == "requires" || Ops.get_string(d, "dep_kind", "") == "recommends") - patternPackages = Builtins.add( - patternPackages, - Ops.get_string(d, "name", "") - ) req = true end end @@ -1020,61 +1039,17 @@ end patterns = deep_copy(new_p) - patternPackagesTemp = deep_copy(patternPackages) - run = false - emergency_break = 0 - begin - run = false - emergency_break = Ops.add(emergency_break, 1) - # remove all packages that are pulled in by the resolver anyway - tmp = [] - patternPackagesTemp = Builtins.toset(patternPackagesTemp) - Builtins.foreach(patternPackagesTemp) do |ppackage| - Builtins.foreach(Pkg.ResolvableDependencies(ppackage, :package, "")) do |d| - Builtins.foreach(Ops.get_list(d, "dependencies", [])) do |dd| - if Ops.get_string(dd, "res_kind", "") == "package" && - (Ops.get_string(dd, "dep_kind", "") == "requires" || - Ops.get_string(dd, "dep_kind", "") == "recommends") && - !Builtins.contains( - patternPackages, - Ops.get_string(dd, "name", "") - ) - patternPackages = Builtins.add( - patternPackages, - Ops.get_string(dd, "name", "") - ) - tmp = Builtins.add(tmp, Ops.get_string(dd, "name", "")) - run = true - end - end - end - end - patternPackagesTemp = deep_copy(tmp) - Builtins.y2milestone("temp package list = %1", tmp) - end while run == true && Ops.less_than(emergency_break, 20) - software = {} - if Ops.greater_than(Builtins.size(patterns), 0) - Builtins.foreach(@inst) do |p| - if !Builtins.contains(patternPackages, p) - userpackages = Builtins.add(userpackages, p) - end - end - end - Ops.set( - software, - "packages", - Builtins.sort(Builtins.filter(userpackages) do |pkg| - !Builtins.regexpmatch(pkg, "kernel-.*") || pkg == "kernel-uml" - end) - ) Ops.set(software, "patterns", Builtins.sort(patterns)) # Currently we do not have any information about user deleted packages in # the installed system. # In order to prevent a reinstallation we can take the locked packages at least. # (bnc#888296) software["remove-packages"] = locked_packages + + software["packages"] = to_install_packages + deep_copy(software) end @@ -1096,12 +1071,6 @@ end end - install_packages = Pkg.FilterPackages( - solver_selected = false, - app_selected = false, - user_selected = true, - name_only = true) - software = {} software["packages"] = install_packages software["patterns"] = install_patterns.compact ++++++ autoyast_en_html.tar.bz2 ++++++ ++++ 13712 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 zypper for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at 2014-09-28 19:56:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zypper (Old) and /work/SRC/openSUSE:Factory/.zypper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zypper" Changes: -------- --- /work/SRC/openSUSE:Factory/zypper/zypper.changes 2014-09-20 07:26:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.zypper.new/zypper.changes 2014-09-28 19:56:53.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Sep 25 17:57:51 CEST 2014 - ma(a)suse.de + +- Trigger appdata plugin when system repos have changed (bnc#866257) +- SLE-12 (suse_version 1315) uses it's own translations set (bnc#897176) +- version 1.11.14 + +------------------------------------------------------------------- +Sun Sep 21 01:13:38 CEST 2014 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- Old: ---- zypper-1.11.13.tar.bz2 New: ---- zypper-1.11.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.a9EYnS/_old 2014-09-28 19:56:54.000000000 +0200 +++ /var/tmp/diff_new_pack.a9EYnS/_new 2014-09-28 19:56:54.000000000 +0200 @@ -33,7 +33,7 @@ Summary: Command line software manager using libzypp License: GPL-2.0+ Group: System/Packages -Version: 1.11.13 +Version: 1.11.14 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ zypper-1.11.13.tar.bz2 -> zypper-1.11.14.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/zypper/zypper-1.11.13.tar.bz2 /work/SRC/openSUSE:Factory/.zypper.new/zypper-1.11.14.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 yast2-pkg-bindings for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package yast2-pkg-bindings for openSUSE:Factory checked in at 2014-09-28 19:56:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-pkg-bindings (Old) and /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-pkg-bindings" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-pkg-bindings/yast2-pkg-bindings.changes 2014-09-24 13:09:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new/yast2-pkg-bindings.changes 2014-09-28 19:56:52.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Sep 24 18:16:22 CEST 2014 - schubi(a)suse.de + +- Added onsystem_by_user flag in Pkg.PkgProperties and + Pkg.ResolvableProperties +- Fixed PkgPropertiesAll. It returns only package information about + the package which is defined in the parameters. In former versions + the given package name has not been regarded and the properties + of ALL packages have been returned, which has been wrong. + (needed for bnc#897404) +- 3.1.20 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-3.1.19.tar.bz2 New: ---- yast2-pkg-bindings-3.1.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.5UkHm1/_old 2014-09-28 19:56:53.000000000 +0200 +++ /var/tmp/diff_new_pack.5UkHm1/_new 2014-09-28 19:56:53.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings-devel-doc -Version: 3.1.19 +Version: 3.1.20 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-pkg-bindings-%{version}.tar.bz2 ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.5UkHm1/_old 2014-09-28 19:56:53.000000000 +0200 +++ /var/tmp/diff_new_pack.5UkHm1/_new 2014-09-28 19:56:53.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 3.1.19 +Version: 3.1.20 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-pkg-bindings-3.1.19.tar.bz2 -> yast2-pkg-bindings-3.1.20.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.19/MAINTAINER new/yast2-pkg-bindings-3.1.20/MAINTAINER --- old/yast2-pkg-bindings-3.1.19/MAINTAINER 2014-09-22 12:07:16.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.20/MAINTAINER 2014-09-25 17:20:14.000000000 +0200 @@ -1 +1 @@ -Ladislav Slezák <lslezak(a)suse.cz> +Deprecated file. Use `osc maintainer yast2-pkg-bindings` instead. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.19/package/yast2-pkg-bindings-devel-doc.spec new/yast2-pkg-bindings-3.1.20/package/yast2-pkg-bindings-devel-doc.spec --- old/yast2-pkg-bindings-3.1.19/package/yast2-pkg-bindings-devel-doc.spec 2014-09-22 12:07:17.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.20/package/yast2-pkg-bindings-devel-doc.spec 2014-09-25 17:20:14.000000000 +0200 @@ -16,7 +16,7 @@ # Name: yast2-pkg-bindings-devel-doc -Version: 3.1.19 +Version: 3.1.20 Release: 0 License: GPL-2.0 Group: Documentation/HTML diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.19/package/yast2-pkg-bindings.changes new/yast2-pkg-bindings-3.1.20/package/yast2-pkg-bindings.changes --- old/yast2-pkg-bindings-3.1.19/package/yast2-pkg-bindings.changes 2014-09-22 12:07:17.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.20/package/yast2-pkg-bindings.changes 2014-09-25 17:20:14.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Wed Sep 24 18:16:22 CEST 2014 - schubi(a)suse.de + +- Added onsystem_by_user flag in Pkg.PkgProperties and + Pkg.ResolvableProperties +- Fixed PkgPropertiesAll. It returns only package information about + the package which is defined in the parameters. In former versions + the given package name has not been regarded and the properties + of ALL packages have been returned, which has been wrong. + (needed for bnc#897404) +- 3.1.20 + +------------------------------------------------------------------- Tue Sep 16 19:36:50 UTC 2014 - lslezak(a)suse.cz - SetTargetDU(): added new options ("growonly" and "filesystem") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.19/package/yast2-pkg-bindings.spec new/yast2-pkg-bindings-3.1.20/package/yast2-pkg-bindings.spec --- old/yast2-pkg-bindings-3.1.19/package/yast2-pkg-bindings.spec 2014-09-22 12:07:17.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.20/package/yast2-pkg-bindings.spec 2014-09-25 17:20:14.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 3.1.19 +Version: 3.1.20 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.19/src/Package.cc new/yast2-pkg-bindings-3.1.20/src/Package.cc --- old/yast2-pkg-bindings-3.1.19/src/Package.cc 2014-09-22 12:07:17.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.20/src/Package.cc 2014-09-25 17:20:14.000000000 +0200 @@ -897,6 +897,8 @@ data->add( YCPString("status"), YCPSymbol(status)); + data->add(YCPString("on_system_by_user"), YCPBoolean(item.satSolvable().onSystemByUser())); + data->add( YCPString("location"), YCPString( pkg->location().filename().basename() ) ); data->add( YCPString("path"), YCPString( pkg->location().filename().asString() ) ); @@ -908,18 +910,20 @@ * @builtin PkgProperties * @short Return information about a package * @description - * Return Data about package location, source and which - * media contains the package + * Return Data about package location, source, which + * media contains the package and who has installed. * * <code> - * $["srcid" : YCPInteger, - * "location" : YCPString - * "medianr" : YCPInteger - * "arch" : YCPString - * ] + * $["medianr" :integer + * "arch" :string + * "srcid" :integer + * "status" :symbol + * "on_system_by_user":boolean + * "location" :string + * "path" :string + * ] * </code> * @param package name - * @return map * @usage Pkg::PkgProperties (string package) -> map */ @@ -955,35 +959,21 @@ if (!pkgname.empty()) { - try - { - // access to the Pool of Selectables - zypp::ResPoolProxy selectablePool(zypp::ResPool::instance().proxy()); - - for_(it, selectablePool.byKindBegin<zypp::Package>(), - selectablePool.byKindEnd<zypp::Package>()) + zypp::ui::Selectable::Ptr s = zypp::ui::Selectable::get(pkgname); + if (s) + { + // iterate over installed packages + for_(inst_it, s->installedBegin(), s->installedEnd()) { - zypp::ui::Selectable::Ptr s = (*it); + data->add(PkgProp(*inst_it)); + } - if (s) - { - // iterate over installed packages - for_(inst_it, s->installedBegin(), s->installedEnd()) - { - data->add(PkgProp(*inst_it)); - } - - // iterate over available packages - for_(avail_it, s->availableBegin(), s->availableEnd()) - { - data->add(PkgProp(*avail_it)); - } - } + // iterate over available packages + for_(avail_it, s->availableBegin(), s->availableEnd()) + { + data->add(PkgProp(*avail_it)); } } - catch (...) - { - } } return data; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.19/src/Resolvable_Properties.cc new/yast2-pkg-bindings-3.1.20/src/Resolvable_Properties.cc --- old/yast2-pkg-bindings-3.1.19/src/Resolvable_Properties.cc 2014-09-22 12:07:17.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.20/src/Resolvable_Properties.cc 2014-09-25 17:20:14.000000000 +0200 @@ -60,12 +60,14 @@ @param kind_r kind of resolvable, can be `product, `patch, `package, `pattern or `language @param version version of the resolvable, if empty all versions are returned - @return list<map<string,any>> list of $[ "name":string, "version":string, "arch":string, "source":integer, "status":symbol, "locked":boolean ] maps + @return list<map<string,any>> list of $[ "name":string, "version":string, "arch":string, "source":integer, "status":symbol, "locked":boolean, "on_system_by_user":boolean ] maps status is `installed, `removed, `selected or `available, source is source ID or -1 if the resolvable is installed in the target if status is `available and locked is true then the object is set to taboo, if status is `installed and locked is true then the object locked if status is `selected or `removed there is extra key "transact_by" : symbol, where symbol is `user (the highest level), `app_high (selected by Yast), `app_low and `solver (the lowest level) + on_system_by_user shows if the resolvable has been installed by user(USER,APPL_HIGH,APPL_LOW) or due solved dependencies. This information comes from + the solver which cannot distinguis between the state USER,APPL_HIGH and APPL_LOW. Additionally to keys returned for all resolvables, there also some resolvable-specific ones: @@ -219,6 +221,8 @@ info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); + info->add(YCPString("on_system_by_user"), YCPBoolean(item.satSolvable().onSystemByUser())); + info->add(YCPString("status"), YCPSymbol(stat)); // is the resolvable locked? (Locked or Taboo in the UI) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libstorage for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2014-09-28 19:56:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage (Old) and /work/SRC/openSUSE:Factory/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstorage" Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage/libstorage.changes 2014-09-24 13:09:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2014-09-28 19:56:49.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 25 16:20:52 CEST 2014 - aschnell(a)suse.de + +- sort partitions after certain remove steps (bsc#898362) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-2.25.15.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.15/storage/BtrfsCo.cc new/libstorage-2.25.15/storage/BtrfsCo.cc --- old/libstorage-2.25.15/storage/BtrfsCo.cc 2014-07-21 15:21:12.000000000 +0200 +++ new/libstorage-2.25.15/storage/BtrfsCo.cc 2014-09-25 16:39:17.000000000 +0200 @@ -418,7 +418,7 @@ int BtrfsCo::removeVolume( Volume* v, bool quiet ) { int ret = 0; - y2mil("qiet:" << quiet); + y2mil("quiet:" << quiet); y2mil("vol:" << *v); v->setDeleted(); if( quiet ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.15/storage/Disk.cc new/libstorage-2.25.15/storage/Disk.cc --- old/libstorage-2.25.15/storage/Disk.cc 2014-09-22 16:59:15.000000000 +0200 +++ new/libstorage-2.25.15/storage/Disk.cc 2014-09-25 16:39:17.000000000 +0200 @@ -1387,11 +1387,21 @@ return( ret ); } -static bool volume_ptr_sort_nr( Partition*& rhs, Partition*& lhs ) + + static bool + partition_ptr_sort_nr(Partition*& rhs, Partition*& lhs) + { + return rhs->nr() < lhs->nr(); + } + + + static bool + volume_ptr_sort_nr(const Volume* rhs, const Volume* lhs) { - return( rhs->nr()<lhs->nr() ); + return rhs->nr() < lhs->nr(); } + int Disk::removePartition( unsigned nr ) { y2mil("begin nr " << nr); @@ -1444,7 +1454,7 @@ } if( !l.empty() ) { - l.sort( volume_ptr_sort_nr ); + l.sort(partition_ptr_sort_nr); unsigned old = nr; list<Partition*>::iterator vi = l.begin(); while( vi!=l.end() ) @@ -1454,6 +1464,8 @@ old = save; ++vi; } + // bsc #898362 + vols.sort(volume_ptr_sort_nr); } } if( t==EXTENDED ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.15/storage/TmpfsCo.cc new/libstorage-2.25.15/storage/TmpfsCo.cc --- old/libstorage-2.25.15/storage/TmpfsCo.cc 2014-03-06 17:30:22.000000000 +0100 +++ new/libstorage-2.25.15/storage/TmpfsCo.cc 2014-09-25 16:39:17.000000000 +0200 @@ -121,7 +121,7 @@ int TmpfsCo::removeVolume( Volume* v, bool quiet ) { int ret = 0; - y2mil("qiet:" << quiet); + y2mil("quiet:" << quiet); y2mil("vol:" << *v); v->setDeleted(); if( quiet ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.15/storage/gen_md5sum.cc new/libstorage-2.25.15/storage/gen_md5sum.cc --- old/libstorage-2.25.15/storage/gen_md5sum.cc 2014-09-22 17:00:20.000000000 +0200 +++ new/libstorage-2.25.15/storage/gen_md5sum.cc 2014-09-25 16:40:11.000000000 +0200 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "fee924f98da527cdda90876545c2b3d9" -#define SOURCES_MD5_DATE " Mon Sep 22 17:00:20 CEST 2014 " +#define SOURCES_MD5SUM "159252ac4b2837ecf24dec15944af9e1" +#define SOURCES_MD5_DATE " Thu 25 Sep 16:40:11 CEST 2014 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pam-config for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package pam-config for openSUSE:Factory checked in at 2014-09-28 19:56:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pam-config (Old) and /work/SRC/openSUSE:Factory/.pam-config.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pam-config" Changes: -------- --- /work/SRC/openSUSE:Factory/pam-config/pam-config.changes 2014-04-06 07:10:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pam-config.new/pam-config.changes 2014-09-28 19:56:47.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 25 14:43:18 CEST 2014 - kukuk(a)suse.de + +- Update to pam-config 0.88 + - Add pam_ecryptfs to password section [bnc#895096] + +------------------------------------------------------------------- Old: ---- pam-config-0.87.tar.bz2 New: ---- pam-config-0.88.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam-config.spec ++++++ --- /var/tmp/diff_new_pack.BPia6h/_old 2014-09-28 19:56:48.000000000 +0200 +++ /var/tmp/diff_new_pack.BPia6h/_new 2014-09-28 19:56:48.000000000 +0200 @@ -20,7 +20,7 @@ Summary: Modify common PAM configuration files License: GPL-2.0 Group: System/Management -Version: 0.87 +Version: 0.88 Release: 0 PreReq: pam >= 0.99 Source: %{name}-%{version}.tar.bz2 ++++++ pam-config-0.87.tar.bz2 -> pam-config-0.88.tar.bz2 ++++++ ++++ 12304 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 kbd for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package kbd for openSUSE:Factory checked in at 2014-09-28 19:56:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbd (Old) and /work/SRC/openSUSE:Factory/.kbd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kbd" Changes: -------- --- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2014-09-20 07:26:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2014-09-28 19:56:46.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Sep 25 10:33:55 UTC 2014 - pgajdos(a)suse.com + +- euro{,1,2}.map now produces correct unicode for Euro sign + [bnc#360993] +- added patches: + * kbd-2.0.2-euro-unicode.patch + +------------------------------------------------------------------- New: ---- kbd-2.0.2-euro-unicode.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbd.spec ++++++ --- /var/tmp/diff_new_pack.NLEcfy/_old 2014-09-28 19:56:47.000000000 +0200 +++ /var/tmp/diff_new_pack.NLEcfy/_new 2014-09-28 19:56:47.000000000 +0200 @@ -51,6 +51,7 @@ Patch6: kbd-1.15.2-dumpkeys-C-opt.patch Patch9: kbd-2.0.2-comment-typo-qwerty.patch Patch10: kbd-2.0.2-doshell-reference.patch +Patch11: kbd-2.0.2-euro-unicode.patch BuildRequires: automake BuildRequires: bison @@ -93,6 +94,7 @@ %patch6 %patch9 %patch10 +%patch11 %build for i in `find data/keymaps/mac -type f` ; do ++++++ kbd-2.0.2-euro-unicode.patch ++++++ Index: data/keymaps/i386/include/euro.map =================================================================== --- data/keymaps/i386/include/euro.map.orig 2012-02-27 11:27:10.000000000 +0100 +++ data/keymaps/i386/include/euro.map 2014-09-25 12:31:37.594749095 +0200 @@ -2,5 +2,5 @@ # [Say: "loadkeys euro" to get Euro and cent with Alt on the positions # where many keyboards have E and C. # To get it displayed, use a latin0 (i.e., latin9) font.] -alt keycode 18 = currency +alt keycode 18 = euro alt keycode 46 = cent Index: data/keymaps/i386/include/euro1.map =================================================================== --- data/keymaps/i386/include/euro1.map.orig 2012-02-27 11:27:10.000000000 +0100 +++ data/keymaps/i386/include/euro1.map 2014-09-25 12:31:20.218749689 +0200 @@ -2,5 +2,5 @@ # [Say: "loadkeys euro1" to get Euro and cent with AltGr (right alt) # on the positions where many keyboards have 5 and C. # To get it displayed, use a latin0 (i.e., latin9) font.] -altgr keycode 6 = currency +altgr keycode 6 = euro altgr keycode 46 = cent Index: data/keymaps/i386/include/euro2.map =================================================================== --- data/keymaps/i386/include/euro2.map.orig 2012-02-27 11:27:10.000000000 +0100 +++ data/keymaps/i386/include/euro2.map 2014-09-25 12:31:52.098748600 +0200 @@ -2,5 +2,5 @@ # [Say: "loadkeys euro2" to get Euro and cent with AltGr (right alt) # on the positions where many keyboards have E and C. # To get it displayed, use a latin0 (i.e., latin9) font.] -altgr keycode 18 = currency +altgr keycode 18 = euro altgr keycode 46 = cent -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lockdev for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package lockdev for openSUSE:Factory checked in at 2014-09-28 19:56:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lockdev (Old) and /work/SRC/openSUSE:Factory/.lockdev.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lockdev" Changes: -------- --- /work/SRC/openSUSE:Factory/lockdev/lockdev.changes 2013-05-03 09:26:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lockdev.new/lockdev.changes 2014-09-28 19:56:44.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Sep 25 10:51:50 UTC 2014 - lnussel(a)suse.de + +- add baselibs.conf as source + +------------------------------------------------------------------- +Wed Sep 10 12:17:27 UTC 2014 - lnussel(a)suse.de + +- pass --enable-helper to force use of setgid helper in order to + be able to write /var/lock (bnc#896010) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lockdev.spec ++++++ --- /var/tmp/diff_new_pack.tfruyc/_old 2014-09-28 19:56:45.000000000 +0200 +++ /var/tmp/diff_new_pack.tfruyc/_new 2014-09-28 19:56:45.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package lockdev # -# 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 @@ -25,6 +25,7 @@ Url: http://packages.debian.org/unstable/source/lockdev #Source0: http://ftp.debian.org/debian/pool/main/l/lockdev/%{name}_%{version}.orig.ta… Source0: http://ftp.debian.org/debian/pool/main/l/lockdev/%{name}-%{version}.tar.bz2 +Source90: baselibs.conf Patch0: lockdev-drop-baudboy.h.diff Patch1: lockdev-fix-implicit-declarations.diff Patch2: lockdev-reserve-some-space-to-avoid-buffer-overflow.diff @@ -81,7 +82,7 @@ touch ChangeLog mkdir -p m4 autoreconf -f -i -%configure --disable-silent-rules +%configure --disable-silent-rules --enable-helper make %{?_smp_mflags} %check -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vpnc for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package vpnc for openSUSE:Factory checked in at 2014-09-28 19:56:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vpnc (Old) and /work/SRC/openSUSE:Factory/.vpnc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vpnc" Changes: -------- --- /work/SRC/openSUSE:Factory/vpnc/vpnc.changes 2014-05-22 20:38:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vpnc.new/vpnc.changes 2014-09-28 19:56:43.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 23 15:22:31 UTC 2014 - mpluskal(a)suse.com + +- Add unit file +- Fix building for SLE_11_SP3 +- Clean specfile + +------------------------------------------------------------------- New: ---- vpnc.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vpnc.spec ++++++ --- /var/tmp/diff_new_pack.mdVHlP/_old 2014-09-28 19:56:44.000000000 +0200 +++ /var/tmp/diff_new_pack.mdVHlP/_new 2014-09-28 19:56:44.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package vpnc # -# 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 @@ -15,35 +15,37 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif - - Name: vpnc -BuildRequires: gnutls -BuildRequires: libgcrypt-devel -BuildRequires: libgnutls-devel -BuildRequires: pkg-config -BuildRequires: pkgconfig(systemd) Version: 0.5.3r517 Release: 0 Summary: A Client for Cisco VPN concentrator License: GPL-2.0+ Group: Productivity/Networking/Security Url: http://svn.unix-ag.uni-kl.de/vpnc/branches/vpnc-nortel -Requires: /sbin/ip -Requires: /usr/bin/sed Source: %{name}-%{version}.tar.bz2 # only for checkin warnings... Source1: checkout_svn.sh -Source2: vpnc.conf +Source2: %{name}.conf +Source3: %{name}.service Patch1: vpnc-no-build-dates.patch # most ugly hack ever Patch4: vpnc-restart-after-timeout.diff Patch5: vpnc-pidfile-path.diff Patch6: vpnc-add-name-to-stderr-log.diff +BuildRequires: gnutls +BuildRequires: libgcrypt-devel +BuildRequires: libgnutls-devel +BuildRequires: pkg-config +Requires: %{_bindir}/sed +Requires: /sbin/ip BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} >= 1210 +BuildRequires: pkgconfig(systemd) +%endif %description A VPN client compatible with Cisco's EasyVPN equipment. @@ -58,42 +60,55 @@ It runs entirely in userspace and uses the TUN/TAP driver for access. - - -Authors: --------- - Maurice Massar <vpnc at unix-ag dot uni-kl dot de> - Eduard Bloch <blade at debian dot org> - %prep -%setup -n %{name} +%setup -q -n %{name} %patch1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %build -export CFLAGS="%optflags" -make PREFIX=/usr +export CFLAGS="%{optflags}" +make PREFIX=/usr %{?_smp_mflags} %install -mkdir -p ${RPM_BUILD_ROOT}/%{_rundir}/vpnc -%{__make} install \ - DESTDIR=${RPM_BUILD_ROOT} \ +mkdir -p %{buildroot}/%{_rundir}/vpnc +make install \ + DESTDIR=%{buildroot} \ PREFIX=/usr -rm -rfv ${RPM_BUILD_ROOT}/usr/share/doc/vpnc -install -D -m 0644 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_prefix}/lib/tmpfiles.d/vpnc.conf +rm -rfv %{buildroot}%{_datadir}/doc/vpnc +%if 0%{?suse_version} >= 1210 +install -D -m 0644 $RPM_SOURCE_DIR/%{name}.service %{buildroot}/%{_unitdir}/%{name}@.service +install -D -m 0644 $RPM_SOURCE_DIR/%{name}.conf %{buildroot}/%{_libexecdir}/tmpfiles.d/%{name}.conf +%endif + +%pre +%if 0%{?suse_version} >= 1210 +%service_add_pre %{name}@.service +%endif -%clean -rm -rf %{buildroot} +%post +%if 0%{?suse_version} >= 1210 +%service_add_post %{name}@.service +%endif + +%preun +%if 0%{?suse_version} >= 1210 +%service_del_preun %{name}@.service +%endif + +%postun +%if 0%{?suse_version} >= 1210 +%service_del_postun %{name}@.service +%endif %files %defattr(-,root,root) -%attr(0600,root,root) %config(noreplace) %ghost %{_sysconfdir}/vpnc/default.conf -%{_prefix}/lib/tmpfiles.d/vpnc.conf +%attr(0600,root,root) %config(noreplace) %ghost %{_sysconfdir}/%{name}/default.conf + %ghost %{_rundir}/vpnc -%dir %{_sysconfdir}/vpnc -%{_sysconfdir}/vpnc/vpnc-script +%dir %{_sysconfdir}/%{name} +%{_sysconfdir}/%{name}/vpnc-script %{_sbindir}/vpnc %{_sbindir}/vpnc-disconnect %{_bindir}/cisco-decrypt @@ -101,6 +116,10 @@ %{_mandir}/man1/cisco-decrypt.1.* %{_mandir}/man1/pcf2vpnc.1.* %{_mandir}/man8/vpnc.8.* +%if 0%{?suse_version} >= 1210 +%{_unitdir}/%{name}@.service +%{_libexecdir}/tmpfiles.d/%{name}.conf +%endif %doc ChangeLog COPYING README TODO VERSION %changelog ++++++ vpnc.service ++++++ [Unit] Description=VPNC connection to %i Documentation=man:vpnc(8) http://www.unix-ag.uni-kl.de/~massar/vpnc/ Requires=network.target After=network.target [Service] Type=forking ExecStart=/usr/sbin/vpnc --pid-file=/run/vpnc(a)%i.pid /etc/vpnc/%i.conf PIDFile=/run/vpnc(a)%i.pid [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xterm for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package xterm for openSUSE:Factory checked in at 2014-09-28 19:56:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xterm (Old) and /work/SRC/openSUSE:Factory/.xterm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xterm" Changes: -------- --- /work/SRC/openSUSE:Factory/xterm/xterm.changes 2014-09-20 15:49:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xterm.new/xterm.changes 2014-09-28 19:56:41.000000000 +0200 @@ -1,0 +2,30 @@ +Thu Sep 25 08:28:22 UTC 2014 - pcerny(a)suse.com + +- Patch #311 - 2014/09/18 + * mention xclip in manpage as an alternative workaround for + copying clipboard data, noting that selectToClipboard (from + patch #209) is the recommended approach (Debian #639094). + * correct comparison in do_select_regex() of working position + against starting column. + * correct initialization for regular-expression feature of + exec-selectable and insert-selectable actions (Debian + #758633). + * modify logic for exec-formatted and insert-formatted actions + to ensure that the formatting occurs just after the selection + is received (Debian #758633). + * account for state of reverse-video in special case of cursor + coloring (Debian #759734). + * fix a sign-extension problem in ReGIS support, as well as + correcting a case where ignored-characters were not really + ignored (patch by Ross Combs). + * Enable the "Escape Sequence" menu entry when an OSC 50 is + received. Also disable it if the escape sequence specifies no + font (Debian #760208). + * improve fix for the fontsel menu entry from patch #304: + because the recovery used the "current font", it would fail + if one first selected a valid font, then an invalid font + (Debian #760207). + * correct an off-by-one in limit-check for ScrnLimitChar + function (report by Egmont Koblinger). + +------------------------------------------------------------------- Old: ---- xterm-310.tgz xterm-310.tgz.asc New: ---- xterm-311.tgz xterm-311.tgz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xterm.spec ++++++ --- /var/tmp/diff_new_pack.AeToru/_old 2014-09-28 19:56:43.000000000 +0200 +++ /var/tmp/diff_new_pack.AeToru/_new 2014-09-28 19:56:43.000000000 +0200 @@ -52,7 +52,7 @@ %if 0%{?suse_version} > 1210 Requires: luit %endif -Version: 310 +Version: 311 Release: 0 Summary: The basic X terminal program License: MIT ++++++ xterm-310.tgz -> xterm-311.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-310/MANIFEST new/xterm-311/MANIFEST --- old/xterm-310/MANIFEST 2014-07-15 01:36:58.000000000 +0200 +++ new/xterm-311/MANIFEST 2014-07-28 23:36:30.000000000 +0200 @@ -1,4 +1,4 @@ -MANIFEST for xterm-310, version xterm-310 +MANIFEST for xterm-311, version xterm-311 -------------------------------------------------------------------------------- MANIFEST this file 256colres.h resource-definitions for 256-color mode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-310/button.c new/xterm-311/button.c --- old/xterm-310/button.c 2014-05-26 19:12:51.000000000 +0200 +++ new/xterm-311/button.c 2014-09-18 02:17:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: button.c,v 1.473 2014/05/26 17:12:51 tom Exp $ */ +/* $XTermId: button.c,v 1.481 2014/09/18 00:17:35 tom Exp $ */ /* * Copyright 1999-2013,2014 by Thomas E. Dickey @@ -2177,16 +2177,39 @@ #endif for (i = 0; i < text_list_count; i++) { size_t len = removeControls(xw, text_list[i]); + if (screen->selectToBuffer) { - size_t have = (screen->internal_select - ? strlen(screen->internal_select) + InternalSelect *mydata = &(screen->internal_select); + size_t have = (mydata->buffer + ? strlen(mydata->buffer) : 0); size_t need = have + len + 1; - char *buffer = realloc(screen->internal_select, need); + char *buffer = realloc(mydata->buffer, need); + + screen->selectToBuffer = False; +#if OPT_PASTE64 + screen->base64_paste = mydata->base64_paste; +#endif +#if OPT_READLINE + screen->paste_brackets = mydata->paste_brackets; +#endif if (buffer != 0) { strcpy(buffer + have, text_list[i]); - screen->internal_select = buffer; + mydata->buffer = buffer; } + TRACE(("FormatSelect %d.%d .. %d.%d %s\n", + screen->startSel.row, + screen->startSel.col, + screen->endSel.row, + screen->endSel.col, + mydata->buffer)); + mydata->format_select(w, mydata->format, mydata->buffer, + &(screen->startSel), + &(screen->endSel)); + + free(mydata->format); + free(mydata->buffer); + memset(mydata, 0, sizeof(*mydata)); } else { _WriteSelectionData(xw, (Char *) text_list[i], len); } @@ -3204,7 +3227,7 @@ char *search; int *indexed; - TRACE(("Select_REGEX:%s\n", NonNull(expr))); + TRACE(("Select_REGEX[%d]:%s\n", inx, NonNull(expr))); if (okPosition(screen, &ld, startc) && expr != 0) { if (regcomp(&preg, expr, REG_EXTENDED) == 0) { int firstRow = firstRowOfLine(screen, startc->row, True); @@ -3234,7 +3257,7 @@ int start_col = indexToCol(indexed, len, start_inx); int finis_col = indexToCol(indexed, len, finis_inx); - if (start_col <= actual && + if (start_col >= actual && actual < finis_col) { int test = finis_col - start_col; if (best_len < test) { @@ -4559,53 +4582,33 @@ } /* obtain the selection string, passing the endpoints to caller's parameters */ -static char * -getSelectionString(XtermWidget xw, - Widget w, - XEvent *event, - String *params, - Cardinal *num_params, - CELL *start, CELL *finish) +static void +doSelectionFormat(XtermWidget xw, + Widget w, + XEvent *event, + String *params, + Cardinal *num_params, + FormatSelect format_select) { TScreen *screen = TScreenOf(xw); -#if OPT_PASTE64 - int base64_paste = (int) screen->base64_paste; -#endif -#if OPT_READLINE - int paste_brackets = (int) SCREEN_FLAG(screen, paste_brackets); -#endif + InternalSelect *mydata = &(screen->internal_select); + + memset(mydata, 0, sizeof(*mydata)); + mydata->format = x_strdup(params[0]); + mydata->format_select = format_select; /* override flags so that SelectionReceived only updates a buffer */ #if OPT_PASTE64 + mydata->base64_paste = screen->base64_paste; screen->base64_paste = 0; #endif #if OPT_READLINE + mydata->paste_brackets = screen->paste_brackets; SCREEN_FLAG_unset(screen, paste_brackets); #endif screen->selectToBuffer = True; - screen->internal_select = 0; xtermGetSelection(w, getEventTime(event), params + 1, *num_params - 1, NULL); - screen->selectToBuffer = False; - - if (screen->internal_select != 0) { - TRACE(("getSelectionString %d:%s\n", - (int) strlen(screen->internal_select), - screen->internal_select)); - *start = screen->startSel; - *finish = screen->endSel; - } else { - memset(start, 0, sizeof(*start)); - memset(finish, 0, sizeof(*finish)); - } -#if OPT_PASTE64 - screen->base64_paste = (Cardinal) base64_paste; -#endif -#if OPT_READLINE - if (paste_brackets) - SCREEN_FLAG_set(screen, paste_brackets); -#endif - return screen->internal_select; } /* obtain data from the screen, passing the endpoints to caller's parameters */ @@ -4625,10 +4628,13 @@ int save_firstValidRow = screen->firstValidRow; int save_lastValidRow = screen->lastValidRow; + const Cardinal noClick = 0; + int save_numberOfClicks = screen->numberOfClicks; + SelectUnit saveUnits = screen->selectUnit; - SelectUnit saveMap = screen->selectMap[0]; + SelectUnit saveMap = screen->selectMap[noClick]; #if OPT_SELECT_REGEX - char *saveExpr = screen->selectExpr[0]; + char *saveExpr = screen->selectExpr[noClick]; #endif Char *save_selection_data = screen->selection_data; @@ -4643,13 +4649,15 @@ screen->selection_size = 0; screen->selection_length = 0; - lookupSelectUnit(xw, 0, method); - screen->selectUnit = screen->selectMap[0]; + screen->numberOfClicks = 1; + lookupSelectUnit(xw, noClick, method); + screen->selectUnit = screen->selectMap[noClick]; memset(start, 0, sizeof(*start)); start->row = screen->cur_row; start->col = screen->cur_col; - *finish = *start; + finish->row = screen->cur_row; + finish->col = screen->max_col; ComputeSelect(xw, start, finish, False); SaltTextAway(xw, &(screen->startSel), &(screen->endSel)); @@ -4676,10 +4684,11 @@ screen->firstValidRow = save_firstValidRow; screen->lastValidRow = save_lastValidRow; + screen->numberOfClicks = save_numberOfClicks; screen->selectUnit = saveUnits; - screen->selectMap[0] = saveMap; + screen->selectMap[noClick] = saveMap; #if OPT_SELECT_REGEX - screen->selectExpr[0] = saveExpr; + screen->selectExpr[noClick] = saveExpr; #endif screen->selection_data = save_selection_data; @@ -4974,35 +4983,39 @@ } } +static void +reallyExecFormatted(Widget w, char *format, char *data, CELL *start, CELL *finish) +{ + XtermWidget xw; + + if ((xw = getXtermWidget(w)) != 0) { + char **argv; + char *blob; + int argc; + + if ((argv = tokenizeFormat(format)) != 0) { + blob = argv[0]; + for (argc = 0; argv[argc] != 0; ++argc) { + argv[argc] = expandFormat(xw, argv[argc], data, start, finish); + } + executeCommand(argv); + freeArgv(blob, argv); + } + } +} + void HandleExecFormatted(Widget w, - XEvent *event GCC_UNUSED, + XEvent *event, String *params, /* selections */ Cardinal *num_params) { XtermWidget xw; - if ((xw = getXtermWidget(w)) != 0) { - TRACE(("HandleExecFormatted(%d)\n", *num_params)); - - if (*num_params > 1) { - CELL start, finish; - char *data; - char **argv; - char *blob; - int argc; - - data = getSelectionString(xw, w, event, params, num_params, - &start, &finish); - if ((argv = tokenizeFormat(params[0])) != 0) { - blob = argv[0]; - for (argc = 0; argv[argc] != 0; ++argc) { - argv[argc] = expandFormat(xw, argv[argc], data, &start, &finish); - } - executeCommand(argv); - freeArgv(blob, argv); - } - } + TRACE(("HandleExecFormatted(%d)\n", *num_params)); + if ((xw = getXtermWidget(w)) != 0 && + (*num_params > 1)) { + doSelectionFormat(xw, w, event, params, num_params, reallyExecFormatted); } } @@ -5041,32 +5054,34 @@ } } +static void +reallyInsertFormatted(Widget w, char *format, char *data, CELL *start, CELL *finish) +{ + XtermWidget xw; + + if ((xw = getXtermWidget(w)) != 0) { + char *exps; + + if ((exps = expandFormat(xw, format, data, start, finish)) != 0) { + unparseputs(xw, exps); + unparse_end(xw); + free(exps); + } + } +} + void HandleInsertFormatted(Widget w, - XEvent *event GCC_UNUSED, + XEvent *event, String *params, /* selections */ Cardinal *num_params) { XtermWidget xw; - if ((xw = getXtermWidget(w)) != 0) { - TRACE(("HandleInsertFormatted(%d)\n", *num_params)); - - if (*num_params > 1) { - CELL start, finish; - char *data; - char *temp = x_strdup(params[0]); - char *exps; - - data = getSelectionString(xw, w, event, params, num_params, - &start, &finish); - if ((exps = expandFormat(xw, temp, data, &start, &finish)) != 0) { - unparseputs(xw, exps); - free(exps); - } - free(data); - free(temp); - } + TRACE(("HandleInsertFormatted(%d)\n", *num_params)); + if ((xw = getXtermWidget(w)) != 0 && + (*num_params > 1)) { + doSelectionFormat(xw, w, event, params, num_params, reallyInsertFormatted); } } @@ -5092,6 +5107,7 @@ exps = expandFormat(xw, temp, data, &start, &finish); if (exps != 0) { unparseputs(xw, exps); + unparse_end(xw); free(exps); } free(data); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-310/charproc.c new/xterm-311/charproc.c --- old/xterm-310/charproc.c 2014-07-13 00:49:54.000000000 +0200 +++ new/xterm-311/charproc.c 2014-09-16 01:39:44.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: charproc.c,v 1.1367 2014/07/12 22:49:54 Steve.Wall Exp $ */ +/* $XTermId: charproc.c,v 1.1370 2014/09/15 23:39:44 tom Exp $ */ /* * Copyright 1999-2013,2014 by Thomas E. Dickey @@ -7972,8 +7972,8 @@ DefaultFontNames[fWide] = x_strdup(wnew->misc.default_font.f_w); DefaultFontNames[fWBold] = x_strdup(wnew->misc.default_font.f_wb); #endif - TScreenOf(wnew)->MenuFontName(fontMenu_fontescape) = NULL; - TScreenOf(wnew)->MenuFontName(fontMenu_fontsel) = NULL; + TScreenOf(wnew)->EscapeFontName() = NULL; + TScreenOf(wnew)->SelectFontName() = NULL; TScreenOf(wnew)->menu_font_number = fontMenu_default; init_Sres(screen.initial_font); @@ -9830,7 +9830,9 @@ } } } - if (T_COLOR(screen, TEXT_CURSOR) == xw->dft_foreground) { + if (T_COLOR(screen, TEXT_CURSOR) == (reversed + ? xw->dft_background + : xw->dft_foreground)) { setCgsBack(xw, currentWin, currentCgs, fg_pix); } setCgsFore(xw, currentWin, currentCgs, bg_pix); @@ -9906,7 +9908,9 @@ * Set up a new request. */ if (filled) { - if (T_COLOR(screen, TEXT_CURSOR) == xw->dft_foreground) { + if (T_COLOR(screen, TEXT_CURSOR) == (reversed + ? xw->dft_background + : xw->dft_foreground)) { setCgsBack(xw, currentWin, currentCgs, fg_pix); } setCgsFore(xw, currentWin, currentCgs, bg_pix); @@ -10764,7 +10768,7 @@ } else { Boolean failed = False; int oldFont = TScreenOf(xw)->menu_font_number; - String save = TScreenOf(xw)->MenuFontName(fontMenu_fontsel); + String save = TScreenOf(xw)->SelectFontName(); char *val; char *test = 0; char *used = 0; @@ -10794,14 +10798,14 @@ && used != 0 && !strchr(used, '\n') && (test = x_strdup(used)) != 0) { - TScreenOf(xw)->MenuFontName(fontMenu_fontsel) = test; + TScreenOf(xw)->SelectFontName() = test; if (!xtermLoadFont(term, xtermFontName(used), True, fontMenu_fontsel)) { failed = True; free(test); - TScreenOf(xw)->MenuFontName(fontMenu_fontsel) = save; + TScreenOf(xw)->SelectFontName() = save; } } else { failed = True; @@ -10830,7 +10834,7 @@ Atom target; if (!atom_name) - atom_name = (screen->mappedSelect + atom_name = ((screen->mappedSelect && atomCount) ? screen->mappedSelect[0] : "PRIMARY"); TRACE(("FindFontSelection(%s)\n", atom_name)); @@ -10850,10 +10854,10 @@ target = XmuInternAtom(XtDisplay(xw), *pAtom); if (justprobe) { - screen->MenuFontName(fontMenu_fontsel) = + screen->SelectFontName() = XGetSelectionOwner(XtDisplay(xw), target) ? _Font_Selected_ : 0; TRACE(("...selected fontname '%s'\n", - NonNull(screen->MenuFontName(fontMenu_fontsel)))); + NonNull(screen->SelectFontName()))); } else { XtGetSelectionValue((Widget) xw, target, XA_STRING, DoSetSelectedFont, NULL, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-310/fontutils.c new/xterm-311/fontutils.c --- old/xterm-310/fontutils.c 2014-07-13 02:34:40.000000000 +0200 +++ new/xterm-311/fontutils.c 2014-09-04 01:58:53.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: fontutils.c,v 1.440 2014/07/13 00:34:40 Ross.Combs Exp $ */ +/* $XTermId: fontutils.c,v 1.443 2014/09/03 23:58:53 tom Exp $ */ /* * Copyright 1998-2013,2014 by Thomas E. Dickey @@ -51,12 +51,6 @@ #include <stdio.h> #include <ctype.h> -#define ALLOC_STRING(name) \ - if (name != 0) \ - name = x_strdup(name) -#define FREE_STRING(name) \ - free_string(name) - #define SetFontWidth(screen,dst,src) (dst)->f_width = (src) #define SetFontHeight(screen,dst,src) (dst)->f_height = dimRound((screen)->scale_height * (float) (src)) @@ -126,12 +120,6 @@ char *end; } FontNameProperties; -static void -free_string(String value) -{ - free((void *) value); -} - #if OPT_RENDERFONT static void fillInFaceSize(XtermWidget, int); #endif @@ -1145,7 +1133,9 @@ &fnts[fNorm], warn[fNorm], (fontnum == fontMenu_default))) { - SetItemSensitivity(fontMenuEntries[fontnum].widget, False); + if (fontnum != fontMenu_fontsel) { + SetItemSensitivity(fontMenuEntries[fontnum].widget, False); + } goto bad; } @@ -1437,8 +1427,7 @@ FREE_STRING(screen->MenuFontName(fontnum)); screen->MenuFontName(fontnum) = tmpname; if (fontnum == fontMenu_fontescape) { - SetItemSensitivity(fontMenuEntries[fontMenu_fontescape].widget, - True); + update_font_escape(); } #if OPT_SHIFT_FONTS screen->menu_font_sizes[fontnum] = FontSize(fnts[fNorm].fs); @@ -1477,7 +1466,7 @@ free(tmpname); #if OPT_RENDERFONT - if (fontnum == fontMenu_fontsel) { + if ((fontnum == fontMenu_fontsel) && (fontnum != screen->menu_font_number)) { int old_fontnum = screen->menu_font_number; #if OPT_TOOLBAR SetItemSensitivity(fontMenuEntries[fontnum].widget, True); @@ -1492,8 +1481,10 @@ TRACE(("...recovering for TrueType fonts\n")); code = xtermLoadFont(xw, &myfonts, doresize, fontnum); if (code) { - SetItemSensitivity(fontMenuEntries[fontnum].widget, - UsingRenderFont(xw)); + if (fontnum != fontMenu_fontsel) { + SetItemSensitivity(fontMenuEntries[fontnum].widget, + UsingRenderFont(xw)); + } TRACE(("...recovered size %dx%d\n", FontHeight(screen), FontWidth(screen))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-310/graphics_regis.c new/xterm-311/graphics_regis.c --- old/xterm-310/graphics_regis.c 2014-07-13 11:10:24.000000000 +0200 +++ new/xterm-311/graphics_regis.c 2014-09-17 10:35:49.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: graphics_regis.c,v 1.42 2014/07/13 09:10:24 tom Exp $ */ +/* $XTermId: graphics_regis.c,v 1.44 2014/09/17 08:35:49 tom Exp $ */ /* * Copyright 2014 by Ross Combs @@ -188,7 +188,7 @@ unsigned load_alphabet; unsigned load_w, load_h; unsigned load_index; - char load_glyph; + unsigned load_glyph; unsigned load_row; /* text options */ int string_rot_set; /* flag to distinguish string vs. character rotation */ @@ -3729,7 +3729,7 @@ state->load_w = 8U; state->load_h = 10U; state->load_alphabet = 1U; - state->load_glyph = '\0'; + state->load_glyph = (unsigned) (unsigned char) '\0'; state->load_row = 0U; break; case 'P': @@ -4777,10 +4777,14 @@ (RegisterNum) register_num, r, g, b); continue; - } + } { + char skip; - TRACE(("DATA_ERROR: ignoring unexpected character in ReGIS screen color register mapping value \"%c\"\n", - pop_fragment(&optionarg))); + skip = pop_fragment(&optionarg); + (void) skip; /* variable needed only if tracing */ + TRACE(("DATA_ERROR: ignoring unexpected character in ReGIS screen color register mapping value \"%c\"\n", + skip)); + } return 1; } } @@ -5050,8 +5054,12 @@ } TRACE(("size multiplier: %s\n", fragment_to_tempstr(&sizemultiplierarg))); - load_regis_extent(fragment_to_tempstr(&sizemultiplierarg), - 0, 0, &ww, &hh); + if (!load_regis_extent(fragment_to_tempstr(&sizemultiplierarg), + 0, 0, &ww, &hh)) { + TRACE(("DATA_ERROR: unable to parse extent in '%c' command: \"%s\"\n", + state->option, fragment_to_tempstr(&sizemultiplierarg))); + break; + } if (!regis_num_to_int(&sizemultiplierarg, &sizemultiplier)) { TRACE(("DATA_ERROR: unable to parse extent in size multiplier option: \"%s\"\n", fragment_to_tempstr(&sizemultiplierarg))); @@ -5195,8 +5203,12 @@ } TRACE(("unitsize cell size: %s\n", fragment_to_tempstr(&unitsizearg))); - load_regis_extent(fragment_to_tempstr(&unitsizearg), 0, 0, - &unit_w, &unit_h); + if (!load_regis_extent(fragment_to_tempstr(&unitsizearg), 0, 0, + &unit_w, &unit_h)) { + TRACE(("DATA_ERROR: unable to parse extent in '%c' command: \"%s\"\n", + state->option, fragment_to_tempstr(&unitsizearg))); + break; + } if (!regis_num_to_int(&unitsizearg, &unitsize)) { TRACE(("DATA_ERROR: unable to parse extent in text unit cell size option: \"%s\"\n", fragment_to_tempstr(&unitsizearg))); @@ -5690,8 +5702,9 @@ if (extract_regis_string(input, state->temp, state->templen)) { switch (state->command) { case 'l': + /* FIXME: confirm that extra characters are ignored */ TRACE(("found character to load: \"%s\"\n", state->temp)); - state->load_glyph = state->temp[0]; /* FIXME: proper conversion */ + state->load_glyph = (unsigned) (unsigned char) state->temp[0]; state->load_row = 0U; break; case 't': @@ -5744,11 +5757,11 @@ unsigned glyph_size; val = strtoul(state->temp, NULL, 16); - TRACE(("found row %u for glyph \"%c\": \"%s\" value %02lx (%lu)\n", + TRACE(("found row %u for glyph %u: \"%s\" value %02lx (%lu)\n", state->load_row, state->load_glyph, state->temp, val, val)); if (state->load_row >= state->load_h) { - TRACE(("DATA_ERROR: ignoring extra glyph row for \"%c\"\n", + TRACE(("DATA_ERROR: ignoring extra row for glyph %u\n", state->load_glyph)); return 0; } @@ -5777,7 +5790,7 @@ unsigned unused_bits; glyph = &context->alphabets[state->load_index] - .bytes[(unsigned) state->load_glyph * glyph_size]; + .bytes[state->load_glyph * glyph_size]; bytew = GLYPH_WIDTH_BYTES(context->alphabets[state->load_index] .pixw); unused_bits = 8U - (context->alphabets[state->load_index].pixw @@ -5798,9 +5811,9 @@ state->load_row++; context->alphabets[state->load_index] - .loaded[(unsigned) state->load_glyph] = 1; + .loaded[state->load_glyph] = 1; #ifdef DEBUG_LOAD - TRACE(("marking alphabet %u at index %u glyph '%c' as loaded\n", + TRACE(("marking alphabet %u at index %u glyph %u as loaded\n", state->load_alphabet, state->load_index, state->load_glyph)); #endif @@ -5893,8 +5906,14 @@ continue; if (state->input.pos >= state->input.len) break; - TRACE(("DATA_ERROR: skipping unknown token in optionset: \"%c\"\n", - pop_fragment(&state->input))); + { + char skip; + + skip = pop_fragment(&state->input); + (void) skip; /* variable needed only if tracing */ + TRACE(("DATA_ERROR: skipping unexpected character in optionset: \"%c\"\n", + skip)); + } /* FIXME: suboptions */ } state->option = '_'; @@ -5929,8 +5948,14 @@ } if (state->input.pos >= state->input.len) return 0; - TRACE(("DATA_ERROR: skipping unknown token at top level: \"%c\"\n", - pop_fragment(&state->input))); + + { + char skip; + + skip = pop_fragment(&state->input); + (void) skip; /* variable needed only if tracing */ + TRACE(("DATA_ERROR: skipping unexpected character at top level: \"%c\"\n", ch)); + } return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-310/menu.c new/xterm-311/menu.c --- old/xterm-310/menu.c 2014-07-13 00:50:28.000000000 +0200 +++ new/xterm-311/menu.c 2014-09-04 01:35:52.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: menu.c,v 1.326 2014/07/12 22:50:28 Steve.Wall Exp $ */ +/* $XTermId: menu.c,v 1.327 2014/09/03 23:35:52 tom Exp $ */ /* * Copyright 1999-2013,2014 by Thomas E. Dickey @@ -822,10 +822,7 @@ if (IsEmpty(screen->menu_font_names[n][fNorm])) SetItemSensitivity(fontMenuEntries[n].widget, False); } - SetItemSensitivity( - fontMenuEntries[fontMenu_fontescape].widget, - (screen->menu_font_names[fontMenu_fontescape][fNorm] - ? True : False)); + update_font_escape(); update_menu_allowBoldFonts(); #if OPT_BOX_CHARS update_font_boxchars(); @@ -872,10 +869,10 @@ SetItemSensitivity(fontMenuEntries[fontMenu_fontsel].widget, True); #else FindFontSelection(xw, NULL, True); - SetItemSensitivity( - fontMenuEntries[fontMenu_fontsel].widget, - (screen->menu_font_names[fontMenu_fontsel][fNorm] - ? True : False)); + SetItemSensitivity(fontMenuEntries[fontMenu_fontsel].widget, + (screen->SelectFontName() + ? True + : False)); #endif break; @@ -2633,6 +2630,19 @@ HANDLE_VT_TOGGLE(allowBoldFonts); } +#if OPT_LOAD_VTFONTS +void +update_font_escape(void) +{ + TScreen *screen = TScreenOf(term); + + SetItemSensitivity(fontMenuEntries[fontMenu_fontescape].widget, + ((screen->allowFontOps && + screen->EscapeFontName()) + ? True : False)); +} +#endif + #if OPT_DEC_CHRSET void HandleFontDoublesize(Widget w, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-310/menu.h new/xterm-311/menu.h --- old/xterm-310/menu.h 2014-04-12 02:03:12.000000000 +0200 +++ new/xterm-311/menu.h 2014-09-04 02:17:55.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: menu.h,v 1.133 2014/04/12 00:03:12 Ross.Combs Exp $ */ +/* $XTermId: menu.h,v 1.135 2014/09/04 00:17:55 tom Exp $ */ /* * Copyright 1999-2013,2014 by Thomas E. Dickey @@ -452,6 +452,12 @@ #define update_marginbell() /* nothing */ +#if OPT_LOAD_VTFONTS +extern void update_font_escape(void); +#else +#define update_font_escape() /* nothing */ +#endif + #if OPT_ALLOW_XXX_OPS extern void update_menu_allowColorOps(void); extern void update_menu_allowFontOps(void); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-310/misc.c new/xterm-311/misc.c --- old/xterm-310/misc.c 2014-05-26 16:45:58.000000000 +0200 +++ new/xterm-311/misc.c 2014-09-04 01:59:25.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: misc.c,v 1.712 2014/05/26 14:45:58 tom Exp $ */ +/* $XTermId: misc.c,v 1.714 2014/09/03 23:59:25 tom Exp $ */ /* * Copyright 1999-2013,2014 by Thomas E. Dickey @@ -3412,6 +3412,10 @@ num = screen->menu_font_number; } name = x_strtrim(buf); + if (screen->EscapeFontName()) { + FREE_STRING(screen->EscapeFontName()); + screen->EscapeFontName() = 0; + } if (success && !IsEmpty(name)) { #if OPT_RENDERFONT if (UsingRenderFont(xw)) { @@ -3423,10 +3427,15 @@ memset(&fonts, 0, sizeof(fonts)); fonts.f_n = name; SetVTFont(xw, num, True, &fonts); + if (num == screen->menu_font_number && + num != fontMenu_fontescape) { + screen->EscapeFontName() = x_strdup(name); + } } } else { Bell(xw, XkbBI_MinorError, 0); } + update_font_escape(); free(name); } } @@ -3528,6 +3537,7 @@ * a special case. */ switch (mode) { + case 50: #if OPT_ISO_COLORS case OSC_Reset(4): case OSC_Reset(5): @@ -6044,3 +6054,9 @@ screen->embed_wide = (Dimension) attrs.width; } } + +void +free_string(String value) +{ + free((void *) value); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-310/package/debian/changelog new/xterm-311/package/debian/changelog --- old/xterm-310/package/debian/changelog 2014-07-15 01:36:58.000000000 +0200 +++ new/xterm-311/package/debian/changelog 2014-07-28 23:36:30.000000000 +0200 @@ -1,3 +1,9 @@ +xterm-dev (311) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <dickey(a)invisible-island.net> Mon, 28 Jul 2014 17:36:30 -0400 + xterm-dev (310) unstable; urgency=low * maintenance updates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-310/package/freebsd/Makefile new/xterm-311/package/freebsd/Makefile --- old/xterm-310/package/freebsd/Makefile 2014-07-26 01:40:38.000000000 +0200 +++ new/xterm-311/package/freebsd/Makefile 2014-07-28 23:36:30.000000000 +0200 @@ -5,7 +5,7 @@ # and "make makesum". PORTNAME= xterm -PORTVERSION= 310 +PORTVERSION= 311 CATEGORIES= x11 MASTER_SITES= ftp://invisible-island.net/xterm/ \ CRITICAL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-310/package/xterm.spec new/xterm-311/package/xterm.spec --- old/xterm-310/package/xterm.spec 2014-07-15 01:36:58.000000000 +0200 +++ new/xterm-311/package/xterm.spec 2014-07-28 23:36:30.000000000 +0200 @@ -1,11 +1,11 @@ -# $XTermId: xterm.spec,v 1.75 2014/07/14 23:36:58 tom Exp $ +# $XTermId: xterm.spec,v 1.76 2014/07/28 21:36:30 tom Exp $ Summary: X terminal emulator (development version) %global my_middle xterm %global my_suffix -dev %global fullname %{my_middle}%{my_suffix} %global my_class XTermDev Name: %{fullname} -Version: 310 +Version: 311 Release: 1 License: X11 Group: User Interface/X diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-310/ptyx.h new/xterm-311/ptyx.h --- old/xterm-310/ptyx.h 2014-06-13 02:53:35.000000000 +0200 +++ new/xterm-311/ptyx.h 2014-09-17 10:24:34.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: ptyx.h,v 1.809 2014/06/13 00:53:35 tom Exp $ */ +/* $XTermId: ptyx.h,v 1.813 2014/09/17 08:24:34 tom Exp $ */ /* * Copyright 1999-2013,2014 by Thomas E. Dickey @@ -910,6 +910,23 @@ } TermColors; /* + * Definitions for exec-formatted and insert-formatted actions. + */ +typedef void (*FormatSelect) (Widget, char *, char *, CELL *, CELL *); + +typedef struct { + char *format; + char *buffer; + FormatSelect format_select; +#if OPT_PASTE64 + Cardinal base64_paste; +#endif +#if OPT_READLINE + unsigned paste_brackets; +#endif +} InternalSelect; + +/* * Constants for titleModes resource */ typedef enum { @@ -2294,7 +2311,7 @@ int lastValidRow; /* " " */ Boolean selectToBuffer; /* copy selection to buffer */ - char * internal_select; + InternalSelect internal_select; String default_string; String eightbit_select_types; @@ -2328,6 +2345,8 @@ String initial_font; String menu_font_names[NMENUFONTS][fMAX]; #define MenuFontName(n) menu_font_names[n][fNorm] +#define EscapeFontName() MenuFontName(fontMenu_fontescape) +#define SelectFontName() MenuFontName(fontMenu_fontsel) long menu_font_sizes[NMENUFONTS]; int menu_font_number; #if OPT_LOAD_VTFONTS || OPT_WIDE_CHARS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-310/screen.c new/xterm-311/screen.c --- old/xterm-310/screen.c 2014-06-19 23:09:11.000000000 +0200 +++ new/xterm-311/screen.c 2014-07-30 10:06:23.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: screen.c,v 1.500 2014/06/19 21:09:11 tom Exp $ */ +/* $XTermId: screen.c,v 1.501 2014/07/30 08:06:23 tom Exp $ */ /* * Copyright 1999-2013,2014 by Thomas E. Dickey @@ -1254,8 +1254,8 @@ if (col < first || col > last) { TRACE(("ScrnInsertChar - col %d outside [%d..%d]\n", col, first, last)); return; - } else if (last <= (col + (int) n)) { - n = (unsigned) (last - col); + } else if (last < (col + (int) n)) { + n = (unsigned) (last + 1 - col); } assert(screen->cur_col >= 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-310/version.h new/xterm-311/version.h --- old/xterm-310/version.h 2014-07-26 02:04:51.000000000 +0200 +++ new/xterm-311/version.h 2014-09-18 23:12:19.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: version.h,v 1.395 2014/07/26 00:04:51 tom Exp $ */ +/* $XTermId: version.h,v 1.397 2014/09/18 21:12:19 tom Exp $ */ /* * Copyright 1998-2013,2014 by Thomas E. Dickey @@ -38,8 +38,8 @@ * version of X to which this version of xterm has been built. The resulting * number in parentheses is my patch number (Thomas E. Dickey). */ -#define XTERM_PATCH 310 -#define XTERM_DATE 2014-07-25 +#define XTERM_PATCH 311 +#define XTERM_DATE 2014-09-18 #ifndef __vendorversion__ #define __vendorversion__ "XTerm" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-310/xterm.h new/xterm-311/xterm.h --- old/xterm-310/xterm.h 2014-07-25 00:47:09.000000000 +0200 +++ new/xterm-311/xterm.h 2014-09-04 01:58:49.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: xterm.h,v 1.745 2014/07/24 22:47:09 tom Exp $ */ +/* $XTermId: xterm.h,v 1.746 2014/09/03 23:58:49 tom Exp $ */ /* * Copyright 1999-2013,2014 by Thomas E. Dickey @@ -367,6 +367,12 @@ #define Maybe 2 +#define ALLOC_STRING(name) \ + if (name != 0) \ + name = x_strdup(name) +#define FREE_STRING(name) \ + free_string(name) + /***====================================================================***/ #define XtNallowBoldFonts "allowBoldFonts" @@ -1066,6 +1072,7 @@ extern void do_xevents (void); extern void end_tek_mode (void); extern void end_vt_mode (void); +extern void free_string(String value); extern void hide_tek_window (void); extern void hide_vt_window (void); extern void ice_error (IceConn /* iceConn */); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-310/xterm.log.html new/xterm-311/xterm.log.html --- old/xterm-310/xterm.log.html 2014-07-26 02:05:11.000000000 +0200 +++ new/xterm-311/xterm.log.html 2014-09-18 23:11:45.000000000 +0200 @@ -30,7 +30,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * ***************************************************************************** - $XTermId: xterm.log.html,v 1.1511 2014/07/26 00:05:11 tom Exp $ + $XTermId: xterm.log.html,v 1.1522 2014/09/18 21:11:45 tom Exp $ --> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> @@ -72,6 +72,8 @@ CHANGELOG</a>).</p> <ul> + <li><a href="#xterm_311">Patch #311 - 2014/09/18</a></li> + <li><a href="#xterm_310">Patch #310 - 2014/07/25</a></li> <li><a href="#xterm_309">Patch #309 - 2014/07/13</a></li> @@ -905,6 +907,48 @@ <li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li> </ul> + <h1><a name="xterm_311" id="xterm_311">Patch #311 - + 2014/09/18</a></h1> + + <ul> + <li>mention <code>xclip</code> in manpage as an alternative + workaround for copying clipboard data, noting that + <code>selectToClipboard</code> (from <a href="#xterm_209">patch + #209</a>) is the recommended approach (Debian #639094).</li> + + <li>correct comparison in do_select_regex() of working position + against starting column.</li> + + <li>correct initialization for regular-expression feature of + <code>exec-selectable</code> and <code>insert-selectable</code> + actions (Debian #758633).</li> + + <li>modify logic for <code>exec-formatted</code> and + <code>insert-formatted</code> actions to ensure that the + formatting occurs just after the selection is received (Debian + #758633).</li> + + <li>account for state of reverse-video in special case of + cursor coloring (Debian #759734).</li> + + <li>fix a sign-extension problem in ReGIS support, as well as + correcting a case where ignored-characters were not really + ignored (patch by Ross Combs).</li> + + <li>Enable the "Escape Sequence" menu entry when an OSC 50 + is received. Also disable it if the escape sequence specifies + no font (Debian #760208).</li> + + <li>improve fix for the <code>fontsel</code> menu entry from + <a href="#xterm_304">patch #304</a>: because the recovery used + the "current font", it would fail if one first selected a valid + font, then an invalid font (Debian #760207).</li> + + <li>correct an off-by-one in limit-check for + <code>ScrnLimitChar</code> function (report by Egmont + Koblinger).</li> + </ul> + <h1><a name="xterm_310" id="xterm_310">Patch #310 - 2014/07/25</a></h1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-310/xterm.man new/xterm-311/xterm.man --- old/xterm-310/xterm.man 2014-04-14 20:42:54.000000000 +0200 +++ new/xterm-311/xterm.man 2014-09-18 10:35:37.000000000 +0200 @@ -1,5 +1,5 @@ '\" t -.\" $XTermId: xterm.man,v 1.581 2014/04/14 18:42:54 Ross.Combs Exp $ +.\" $XTermId: xterm.man,v 1.582 2014/09/18 08:35:37 tom Exp $ .\" .\" Copyright 1996-2013,2014 by Thomas E. Dickey .\" @@ -4623,6 +4623,24 @@ the problem with persistence of ownership is bypassed. Otherwise, there is no difference regarding the data which can be passed via selection. +.PP +The PRIMARY token is a standard X feature, documented in the ICCCM +(\fIInter-Client Communication Conventions Manual\fR), +which states +.RS +.PP +The selection named by the atom PRIMARY is used for all commands that take only a single argument and is the principal means of communication between clients that use the selection mechanism. +.RE +.PP +However, many applications use CLIPBOARD in imitation of other windowing +systems. +The \fBselectToClipboard\fP resource (and corresponding menu entry +\fISelect to Clipboard\fP) introduce the SELECT token (known only +to \fI\*n\fP) which chooses between the PRIMARY and CLIPBOARD tokens. +.PP +Without using this feature, one can use workarounds such as the +\fIxclip\fP program to show the contents of the X clipboard within an +\fI\*n\fP window. . .SS SELECTION TARGETS The different types of data which are passed depend on what the receiving -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit krb5 for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package krb5 for openSUSE:Factory checked in at 2014-09-28 19:56:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krb5 (Old) and /work/SRC/openSUSE:Factory/.krb5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "krb5" Changes: -------- --- /work/SRC/openSUSE:Factory/krb5/krb5.changes 2014-09-03 20:09:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.krb5.new/krb5.changes 2014-09-28 19:56:39.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 23 13:25:33 UTC 2014 - varkoly(a)suse.com + +- bnc#897874 CVE-2014-5351: krb5: current keys returned when randomizing the keys for a service principal +- added patches: + * bnc#897874-CVE-2014-5351.diff +------------------------------------------------------------------- New: ---- bnc#897874-CVE-2014-5351.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krb5.spec ++++++ --- /var/tmp/diff_new_pack.AjAvvf/_old 2014-09-28 19:56:41.000000000 +0200 +++ /var/tmp/diff_new_pack.AjAvvf/_new 2014-09-28 19:56:41.000000000 +0200 @@ -83,6 +83,7 @@ Patch13: krb5-1.9-debuginfo.patch Patch14: krb5-kvno-230379.patch Patch20: krb5-1.12-doxygen.patch +Patch21: bnc#897874-CVE-2014-5351.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: mktemp, grep, /bin/touch, coreutils PreReq: %fillup_prereq @@ -203,6 +204,7 @@ %patch13 -p0 %patch14 -p1 %patch20 -p1 +%patch21 -p1 %build # needs to be re-generated ++++++ bnc#897874-CVE-2014-5351.diff ++++++ diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c index 5d358bd..d4e74cc 100644 --- a/src/lib/kadm5/srv/svr_principal.c +++ b/src/lib/kadm5/srv/svr_principal.c @@ -344,6 +344,20 @@ check_1_6_dummy(kadm5_principal_ent_t entry, long mask, *passptr = NULL; } +/* Return the number of keys with the newest kvno. Assumes that all key data + * with the newest kvno are at the front of the key data array. */ +static int +count_new_keys(int n_key_data, krb5_key_data *key_data) +{ + int n; + + for (n = 1; n < n_key_data; n++) { + if (key_data[n - 1].key_data_kvno != key_data[n].key_data_kvno) + return n; + } + return n_key_data; +} + kadm5_ret_t kadm5_create_principal(void *server_handle, kadm5_principal_ent_t entry, long mask, @@ -1593,7 +1607,7 @@ kadm5_randkey_principal_3(void *server_handle, osa_princ_ent_rec adb; krb5_int32 now; kadm5_policy_ent_rec pol; - int ret, last_pwd; + int ret, last_pwd, n_new_keys; krb5_boolean have_pol = FALSE; kadm5_server_handle_t handle = server_handle; krb5_keyblock *act_mkey; @@ -1686,8 +1700,9 @@ kadm5_randkey_principal_3(void *server_handle, kdb->fail_auth_count = 0; if (keyblocks) { - ret = decrypt_key_data(handle->context, - kdb->n_key_data, kdb->key_data, + /* Return only the new keys added by krb5_dbe_crk. */ + n_new_keys = count_new_keys(kdb->n_key_data, kdb->key_data); + ret = decrypt_key_data(handle->context, n_new_keys, kdb->key_data, keyblocks, n_keys); if (ret) goto done; -- 1.8.5.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cyrus-sasl for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package cyrus-sasl for openSUSE:Factory checked in at 2014-09-28 19:56:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cyrus-sasl (Old) and /work/SRC/openSUSE:Factory/.cyrus-sasl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cyrus-sasl" Changes: -------- --- /work/SRC/openSUSE:Factory/cyrus-sasl/cyrus-sasl-saslauthd.changes 2014-08-07 08:07:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cyrus-sasl.new/cyrus-sasl-saslauthd.changes 2014-09-28 19:56:37.000000000 +0200 @@ -2 +2 @@ -Tue Jul 29 23:33:45 UTC 2014 - sfalken(a)opensuse.org +Tue Sep 23 13:57:46 UTC 2014 - varkoly(a)suse.com @@ -4 +4,6 @@ -- Changed references to /var/run, to /run in order to clear rpmlint check failure, due to files being installed to /var/run +- bnc#897837 saslauthd package has no config + +------------------------------------------------------------------- +Tue Jul 29 23:31:35 UTC 2014 - sfalken(a)opensuse.org + +- Changed --with-saslauthd=/var/run/sasl2 in %build to /run/sasl2 to clear rpmlint check failure @@ -13,0 +19,6 @@ +Fri Jun 13 11:03:45 UTC 2014 - ckornacker(a)suse.com + +- Revert upstream commit 080e51c7fa0421eb2f0210d34cf0ac48a228b1e9 + cyrus-sasl-revert_gssapi_flags.patch (bnc#775279) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/cyrus-sasl/cyrus-sasl.changes 2014-08-07 08:07:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cyrus-sasl.new/cyrus-sasl.changes 2014-09-28 19:56:37.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 23 13:57:46 UTC 2014 - varkoly(a)suse.com + +- bnc#897837 saslauthd package has no config + +------------------------------------------------------------------- @@ -17,0 +23,5 @@ + +------------------------------------------------------------------- +Tue Apr 1 10:32:37 UTC 2014 - varkoly(a)suse.com + +- bnc#871183 - cyrus-sasl-saslauthd service file is missing parameter 'Restart=always' ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ cyrus-sasl.spec: same change ++++++ saslauthd.service ++++++ --- /var/tmp/diff_new_pack.5oLJIN/_old 2014-09-28 19:56:39.000000000 +0200 +++ /var/tmp/diff_new_pack.5oLJIN/_new 2014-09-28 19:56:39.000000000 +0200 @@ -5,7 +5,7 @@ [Service] Type=forking EnvironmentFile=/etc/sysconfig/saslauthd -ExecStart=/usr/sbin/saslauthd +ExecStart=/usr/sbin/saslauthd -a $SASLAUTHD_AUTHMECH -n $SASLAUTHD_THREADS ExecReload=/bin/kill -HUP $MAINPID ExecStop=/bin/kill -TERM $MAINPID Restart=always -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-workspace for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '14

28 Sep '14

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2014-09-28 19:56:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-workspace" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2014-09-08 21:29:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2014-09-28 19:56:35.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Sep 22 19:30:45 UTC 2014 - tittiatcoke(a)gmail.com + +- Make kactivities4 a hard requirement (bnc#896660) + +------------------------------------------------------------------- +Sat Sep 13 16:20:45 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.11.12 + * KDE 4.14.1 SC Bugfix Release + * See http://www.kde.org/announcements/announce-4.14.1.php +- Drop upstream patch + changeset_re8241313fc979aefafc8c2a0207570d6394f1580.diff + +------------------------------------------------------------------- Old: ---- changeset_re8241313fc979aefafc8c2a0207570d6394f1580.diff kde-workspace-4.11.11.tar.xz New: ---- kde-workspace-4.11.12.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.DcdxF8/_old 2014-09-28 19:56:37.000000000 +0200 +++ /var/tmp/diff_new_pack.DcdxF8/_new 2014-09-28 19:56:37.000000000 +0200 @@ -19,7 +19,7 @@ %define with_multiseat 1 Name: kdebase4-workspace -Version: 4.11.11 +Version: 4.11.12 Release: 0 Summary: The KDE Workspace Components License: GPL-2.0+ @@ -128,8 +128,6 @@ Patch59: krunner-no-italics.diff # PATCH-FIX-OPENSUSE plasma-disable-networkmanager.diff -- Makes it possible to disable it on KDE start depending on sysconfig Patch60: plasma-disable-networkmanager.diff -# PATCH-FIX-UPSTREAM changeset_re8241313fc979aefafc8c2a0207570d6394f1580.diff -- Require strict binding for intel driver -Patch61: changeset_re8241313fc979aefafc8c2a0207570d6394f1580.diff # PATCH-FIX-OPENSUSE opensuse-homepage.diff -- Makes kickoff use openSUSE homepage as default Patch62: opensuse-homepage.diff # PATCH-FIX-OPENSUSE opensuse-kinfocenter.diff (created by Alin M. Elena to have some openSUSE distro info in kinfocenter) @@ -150,7 +148,7 @@ Requires: %{name}-liboxygenstyle = %{version} # Requires /etc/xdg/menus/applications.menu (bnc#754104) Requires: desktop-data-openSUSE -Recommends: kactivities4 >= %{_kde_platform_version} +Requires: kactivities4 >= 4.13.3 Requires: kde4-kgreeter-plugins = %{version} Requires: kscreen Requires: polkit-kde-agent-1 @@ -383,7 +381,6 @@ %patch57 %patch59 -p1 %patch60 -p1 -%patch61 -p1 %patch62 -p1 %patch63 -p1 %patch64 -p1 ++++++ kde-workspace-4.11.11.tar.xz -> kde-workspace-4.11.12.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdebase4-workspace/kde-workspace-4.11.11.tar.xz /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kde-workspace-4.11.12.tar.xz differ: char 27, line 1 ++++++ opensuse-kinfocenter.diff ++++++ --- /var/tmp/diff_new_pack.DcdxF8/_old 2014-09-28 19:56:37.000000000 +0200 +++ /var/tmp/diff_new_pack.DcdxF8/_new 2014-09-28 19:56:37.000000000 +0200 @@ -1,8 +1,7 @@ -diff --git a/kinfocenter/Modules/infosummary/infosum.cpp b/kinfocenter/Modules/infosummary/infosum.cpp -index 276d00c..c36c311 100644 ---- a/kinfocenter/Modules/infosummary/infosum.cpp -+++ b/kinfocenter/Modules/infosummary/infosum.cpp -@@ -58,12 +58,12 @@ void InfoSumPlugin::createDisplay() +diff -urB kde-workspace-4.11.12/kinfocenter/Modules/infosummary/infosum.cpp new/kinfocenter/Modules/infosummary/infosum.cpp +--- kde-workspace-4.11.12/kinfocenter/Modules/infosummary/infosum.cpp 2014-09-12 09:42:16.000000000 +0200 ++++ new/kinfocenter/Modules/infosummary/infosum.cpp 2014-09-14 09:41:12.275783695 +0200 +@@ -58,12 +58,12 @@ void InfoSumPlugin::createOsBox() { DefaultBoxWidget *osWidget = new DefaultBoxWidget(); @@ -15,14 +14,41 @@ - osWidget->setLabelOne(osInfo->osVersion()); + osWidget->setLabelOne(osInfo->osVersion()+'\n'+osInfo->distroName()); - osWidget->setLabelTwo(QString(KDE_VERSION_STRING)); + osWidget->setLabelTwo(QString(KDE::versionString())); osWidget->setLabelThree(osInfo->hostName()); osWidget->setWhatsThis(i18nc("OS whats this","This shows information about your Operating System")); -diff --git a/kinfocenter/Modules/infosummary/osdepinfo.cpp b/kinfocenter/Modules/infosummary/osdepinfo.cpp -index 34afecc..af1ec45 100644 ---- a/kinfocenter/Modules/infosummary/osdepinfo.cpp -+++ b/kinfocenter/Modules/infosummary/osdepinfo.cpp -@@ -37,6 +37,12 @@ const QString OsDepInfo::osVersion() +diff -urB kde-workspace-4.11.12/kinfocenter/Modules/infosummary/osdepinfo_unix.cpp new/kinfocenter/Modules/infosummary/osdepinfo_unix.cpp +--- kde-workspace-4.11.12/kinfocenter/Modules/infosummary/osdepinfo_unix.cpp 2014-09-12 09:42:16.000000000 +0200 ++++ new/kinfocenter/Modules/infosummary/osdepinfo_unix.cpp 2014-09-14 09:39:42.238790434 +0200 +@@ -23,6 +23,18 @@ + #include "osdepinfo.h" + + #include <sys/utsname.h> ++#include <KConfig> ++#include <KConfigGroup> ++#include <QString> ++ ++QString getDistro() ++{ ++ KConfig osRelease( "/etc/os-release", KConfig::SimpleConfig ); ++ KConfigGroup osR( &osRelease, "" ); ++ QString pretty = osR.readEntry("PRETTY_NAME"); ++ pretty.remove('"'); ++ return(pretty); ++} + + void OsDepInfo::setDepInfo() + { +@@ -31,4 +43,5 @@ + + m_osVersion = QString(unixInfo.sysname) + ' ' + QString(unixInfo.release); + m_hostName = QString(unixInfo.nodename); ++ m_distroName = getDistro(); + } +diff -urB kde-workspace-4.11.12/kinfocenter/Modules/infosummary/osdepinfo.cpp new/kinfocenter/Modules/infosummary/osdepinfo.cpp +--- kde-workspace-4.11.12/kinfocenter/Modules/infosummary/osdepinfo.cpp 2014-09-12 09:42:16.000000000 +0200 ++++ new/kinfocenter/Modules/infosummary/osdepinfo.cpp 2014-09-14 09:39:42.238790434 +0200 +@@ -37,6 +37,12 @@ return m_osVersion; } @@ -35,7 +61,7 @@ #if defined(Q_OS_UNIX) #include "osdepinfo_unix.cpp" #else -@@ -50,6 +56,7 @@ void OsDepInfo::setDepInfo() +@@ -50,6 +56,7 @@ { m_osVersion.clear(); m_hostName.clear(); @@ -43,11 +69,10 @@ } #endif // Q_OS_UNIX -diff --git a/kinfocenter/Modules/infosummary/osdepinfo.h b/kinfocenter/Modules/infosummary/osdepinfo.h -index 3452e8b..564a86c 100644 ---- a/kinfocenter/Modules/infosummary/osdepinfo.h -+++ b/kinfocenter/Modules/infosummary/osdepinfo.h -@@ -32,12 +32,14 @@ class OsDepInfo +diff -urB kde-workspace-4.11.12/kinfocenter/Modules/infosummary/osdepinfo.h new/kinfocenter/Modules/infosummary/osdepinfo.h +--- kde-workspace-4.11.12/kinfocenter/Modules/infosummary/osdepinfo.h 2014-09-12 09:42:16.000000000 +0200 ++++ new/kinfocenter/Modules/infosummary/osdepinfo.h 2014-09-14 09:39:42.238790434 +0200 +@@ -32,12 +32,14 @@ const QString hostName(); const QString osVersion(); @@ -62,33 +87,3 @@ }; #endif //OSDEPINFO -diff --git a/kinfocenter/Modules/infosummary/osdepinfo_unix.cpp b/kinfocenter/Modules/infosummary/osdepinfo_unix.cpp -index d237337..9cbdcd9 100644 ---- a/kinfocenter/Modules/infosummary/osdepinfo_unix.cpp -+++ b/kinfocenter/Modules/infosummary/osdepinfo_unix.cpp -@@ -23,6 +23,18 @@ - #include "osdepinfo.h" - - #include <sys/utsname.h> -+#include <KConfig> -+#include <KConfigGroup> -+#include <QString> -+ -+QString getDistro() -+{ -+ KConfig osRelease( "/etc/os-release", KConfig::SimpleConfig ); -+ KConfigGroup osR( &osRelease, "" ); -+ QString pretty = osR.readEntry("PRETTY_NAME"); -+ pretty.remove('"'); -+ return(pretty); -+} - - void OsDepInfo::setDepInfo() - { -@@ -31,4 +43,5 @@ void OsDepInfo::setDepInfo() - - m_osVersion = QString(unixInfo.sysname) + ' ' + QString(unixInfo.release); - m_hostName = QString(unixInfo.nodename); -+ m_distroName = getDistro(); - } - -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0