June 2014 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-bootloader for openSUSE:Factory
by root＠hilbert.suse.de 26 Jun '14

26 Jun '14

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2014-06-26 08:00:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2014-06-18 10:59:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2014-06-26 08:00:48.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Jun 24 15:10:21 UTC 2014 - jreidinger(a)suse.com + +- respect product default configuration for os-prober enablement + (bnc#884007) +- 3.1.57 + +------------------------------------------------------------------- +Wed Jun 18 14:25:19 CEST 2014 - schubi(a)suse.de + +- Initialize variable correctly for supported bootloaders + (bnc#883040) +- 3.1.56 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.55.tar.bz2 New: ---- yast2-bootloader-3.1.57.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.yrsG63/_old 2014-06-26 08:00:51.000000000 +0200 +++ /var/tmp/diff_new_pack.yrsG63/_new 2014-06-26 08:00:51.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.55 +Version: 3.1.57 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.55.tar.bz2 -> yast2-bootloader-3.1.57.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.55/package/yast2-bootloader.changes new/yast2-bootloader-3.1.57/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.55/package/yast2-bootloader.changes 2014-06-16 13:23:49.000000000 +0200 +++ new/yast2-bootloader-3.1.57/package/yast2-bootloader.changes 2014-06-24 17:28:23.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Tue Jun 24 15:10:21 UTC 2014 - jreidinger(a)suse.com + +- respect product default configuration for os-prober enablement + (bnc#884007) +- 3.1.57 + +------------------------------------------------------------------- +Wed Jun 18 14:25:19 CEST 2014 - schubi(a)suse.de + +- Initialize variable correctly for supported bootloaders + (bnc#883040) +- 3.1.56 + +------------------------------------------------------------------- Mon Jun 16 09:22:43 UTC 2014 - jreidinger(a)suse.com - Allow in autoyast only supported bootloaders (bnc#882210) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.55/package/yast2-bootloader.spec new/yast2-bootloader-3.1.57/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.55/package/yast2-bootloader.spec 2014-06-16 13:23:49.000000000 +0200 +++ new/yast2-bootloader-3.1.57/package/yast2-bootloader.spec 2014-06-24 17:28:23.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.55 +Version: 3.1.57 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.55/src/include/bootloader/routines/autoinstall.rb new/yast2-bootloader-3.1.57/src/include/bootloader/routines/autoinstall.rb --- old/yast2-bootloader-3.1.55/src/include/bootloader/routines/autoinstall.rb 2014-06-16 13:23:49.000000000 +0200 +++ new/yast2-bootloader-3.1.57/src/include/bootloader/routines/autoinstall.rb 2014-06-24 17:28:23.000000000 +0200 @@ -155,6 +155,13 @@ # @return a map the export map def AI2Export(ai) ai = deep_copy(ai) + + # bootloader type and location stuff + exp = { + "loader_type" => Ops.get_string(ai, "loader_type", ""), + "specific" => {} + } + unsupported_bootloaders = ["grub", "zipl", "plilo", "lilo", "elilo"] if ai["loader_type"] && unsupported_bootloaders.include?(exp["loader_type"].downcase) # FIXME this should be better handled by exception and show it properly, but it require too big change now @@ -163,7 +170,6 @@ return nil end - BootCommon.DetectDisks if Mode.autoinst # prepare settings for default bootloader if not specified in the # profile @@ -174,12 +180,6 @@ end Builtins.y2milestone("Bootloader settings from profile: %1", ai) - # bootloader type and location stuff - exp = { - "loader_type" => Ops.get_string(ai, "loader_type", ""), - "specific" => {} - } - # define "global" sub-map to make sure we can add to the globals at # any time Ops.set(exp, ["specific", "global"], {}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.55/src/lib/bootloader/grub2base.rb new/yast2-bootloader-3.1.57/src/lib/bootloader/grub2base.rb --- old/yast2-bootloader-3.1.55/src/lib/bootloader/grub2base.rb 2014-06-16 13:23:49.000000000 +0200 +++ new/yast2-bootloader-3.1.57/src/lib/bootloader/grub2base.rb 2014-06-24 17:28:23.000000000 +0200 @@ -13,15 +13,16 @@ Yast.import "BootArch" Yast.import "BootCommon" Yast.import "BootStorage" + Yast.import "HTML" + Yast.import "Initrd" Yast.import "Kernel" Yast.import "Mode" + Yast.import "Pkg" + Yast.import "Product" + Yast.import "ProductFeatures" Yast.import "Stage" Yast.import "Storage" Yast.import "StorageDevices" - Yast.import "Pkg" - Yast.import "HTML" - Yast.import "Initrd" - Yast.import "Product" # includes # for simplified widgets than other @@ -53,13 +54,15 @@ # Propose global options of bootloader def StandardGlobals + # s390 do not have os_prober, see bnc#868909#c2 + disable_os_prober = Arch.s390 || ProductFeatures.GetBooleanFeature("general", "disable_os_prober") { "timeout" => "8", "default" => "0", "vgamode" => "", "gfxmode" => "auto", "terminal" => Arch.s390 ? "console" : "gfxterm", - "os_prober" => Arch.s390 ? "false" : "true", + "os_prober" => disable_os_prober ? "false" : "true", "activate" => Arch.ppc ? "true" : "false" } end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2 for openSUSE:Factory
by root＠hilbert.suse.de 26 Jun '14

26 Jun '14

Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2014-06-26 08:00:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2014-06-18 10:59:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2014-06-26 08:00:45.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Jun 24 12:59:43 UTC 2014 - jreidinger(a)suse.com + +- add option to disable os probing for some products (bnc#884007) +- 3.1.81 + +------------------------------------------------------------------- +Mon Jun 23 10:38:15 UTC 2014 - mfilka(a)suse.com + +- bnc#864619 + - old network service is also disabled when switching to new one. +- 3.1.80 + +------------------------------------------------------------------- Old: ---- yast2-3.1.79.tar.bz2 New: ---- yast2-3.1.81.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.vsSUyE/_old 2014-06-26 08:00:47.000000000 +0200 +++ /var/tmp/diff_new_pack.vsSUyE/_new 2014-06-26 08:00:47.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.79 +Version: 3.1.81 Release: 0 Url: https://github.com/yast/yast-yast2 ++++++ yast2-3.1.79.tar.bz2 -> yast2-3.1.81.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.79/library/control/src/modules/ProductFeatures.rb new/yast2-3.1.81/library/control/src/modules/ProductFeatures.rb --- old/yast2-3.1.79/library/control/src/modules/ProductFeatures.rb 2014-06-17 16:47:52.000000000 +0200 +++ new/yast2-3.1.81/library/control/src/modules/ProductFeatures.rb 2014-06-24 16:12:52.000000000 +0200 @@ -65,6 +65,7 @@ "relnotesurl" => "", "vendor_url" => "", "enable_clone" => false, + "disable_os_prober" => false, # FATE #304865 "base_product_license_directory" => "/etc/YaST2/licenses/base/" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.79/library/network/src/modules/NetworkService.rb new/yast2-3.1.81/library/network/src/modules/NetworkService.rb --- old/yast2-3.1.79/library/network/src/modules/NetworkService.rb 2014-06-17 16:47:52.000000000 +0200 +++ new/yast2-3.1.81/library/network/src/modules/NetworkService.rb 2014-06-24 16:12:52.000000000 +0200 @@ -26,8 +26,6 @@ # Summary: Init script handling, ifup vs NetworkManager # Authors: Martin Vidner <mvidner(a)suse.cz> # -# $Id$ -# # This module used to switch between /etc/init.d/network providing # LSB network.service and the NetworkManager.service (or another), # which installs a network.service alias link. @@ -107,7 +105,7 @@ end def run_wicked(*params) - cmd = "#{WICKED} #{params.join(" ")}" + cmd = "#{WICKED} #{params.join(" ")}" ret = SCR.Execute( path(".target.bash"), cmd @@ -132,7 +130,7 @@ # Checks if configuration is managed by NetworkManager # - # @return true when the network is managed by an external tool, + # @return true when the network is managed by an external tool, # like NetworkManager, false otherwise def network_manager? cached_service?(:network_manager) @@ -183,7 +181,7 @@ def disable @cached_name = nil stop_service(@current_name) - RunSystemCtl( BACKENDS[ @current_name], "disable") + disable_service(@current_name) Read() end @@ -208,23 +206,12 @@ nil end - # Run /etc/init.d script with specified action - # @param script name of the init script - # @param action the action to use - # @return true, when the script exits with 0 - def RunScript(script, action) - return true if script == "" - Builtins.y2milestone("rc%1 %2", script, action) - # Workaround for bug #61055: - cmd = Builtins.sformat("cd /; /etc/init.d/%1 %2", script, action) - SCR.Execute(path(".target.bash"), cmd) == 0 - end - # Helper to apply a change of the network service def EnableDisableNow return if !Modified() stop_service(@current_name) + disable_service(@current_name) case @cached_name when :network_manager, :wicked @@ -455,6 +442,10 @@ end end + def disable_service(service) + RunSystemCtl( BACKENDS[service], "disable") + end + publish :function => :Read, :type => "void ()" publish :function => :Modified, :type => "boolean ()" publish :function => :is_backend_available, :type => "boolean (symbol)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.79/package/yast2.changes new/yast2-3.1.81/package/yast2.changes --- old/yast2-3.1.79/package/yast2.changes 2014-06-17 16:47:53.000000000 +0200 +++ new/yast2-3.1.81/package/yast2.changes 2014-06-24 16:12:52.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Tue Jun 24 12:59:43 UTC 2014 - jreidinger(a)suse.com + +- add option to disable os probing for some products (bnc#884007) +- 3.1.81 + +------------------------------------------------------------------- +Mon Jun 23 10:38:15 UTC 2014 - mfilka(a)suse.com + +- bnc#864619 + - old network service is also disabled when switching to new one. +- 3.1.80 + +------------------------------------------------------------------- Tue Jun 17 12:56:20 CEST 2014 - schubi(a)suse.de - Fixed error message for missing services diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.79/package/yast2.spec new/yast2-3.1.81/package/yast2.spec --- old/yast2-3.1.79/package/yast2.spec 2014-06-17 16:47:53.000000000 +0200 +++ new/yast2-3.1.81/package/yast2.spec 2014-06-24 16:12:52.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.79 +Version: 3.1.81 Release: 0 URL: https://github.com/yast/yast-yast2 -- 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-installation for openSUSE:Factory
by root＠hilbert.suse.de 26 Jun '14

26 Jun '14

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2014-06-26 08:00:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2014-06-06 14:36:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2014-06-26 08:00:43.000000000 +0200 @@ -1,0 +2,54 @@ +Mon Jun 23 16:09:32 CEST 2014 - locilka(a)suse.com + +- Changed /bin/rm path to /usr/bin/rm path (bnc#882453) +- 3.1.96 + +------------------------------------------------------------------- +Mon Jun 23 13:02:27 UTC 2014 - jreidinger(a)suse.com + +- directly export autoyast profile to target file (bnc#881108) +- 3.1.95 + +------------------------------------------------------------------- +Thu Jun 19 19:05:10 UTC 2014 - lslezak(a)suse.cz + +- removed random_finish client, haveged service is by default + enabled, no need for explicit enabling by Yast + (gh#yast/yast-installation#214) +- 3.1.94 + +------------------------------------------------------------------- +Wed Jun 18 11:47:26 UTC 2014 - lslezak(a)suse.cz + +- make sure the CIO ignore config file ends with a new line + (bnc#883198) +- 3.1.93 + +------------------------------------------------------------------- +Tue Jun 17 12:34:33 UTC 2014 - lslezak(a)suse.cz + +- inst_upgrade_urls.rb: set the future target distribution to not + ignore the SCC online repositories in libzypp (bnc#881320) +- 3.1.92 + +------------------------------------------------------------------- +Mon Jun 16 12:33:18 UTC 2014 - jreidinger(a)suse.com + +- write list of active devices for cio_ignore ( partially written + by Ihno ) +- 3.1.91 + +------------------------------------------------------------------- +Thu Jun 12 15:20:04 UTC 2014 - jreidinger(a)suse.com + +- restore backup if yast failed during installation/upgrade + (bnc#882039) +- 3.1.90 + +------------------------------------------------------------------- +Thu Jun 12 08:27:01 UTC 2014 - lslezak(a)suse.cz + +- properly enable the add-on module in the installation workflow +- 3.1.89 + +------------------------------------------------------------------- Old: ---- yast2-installation-3.1.88.tar.bz2 New: ---- yast2-installation-3.1.96.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.v9awje/_old 2014-06-26 08:00:44.000000000 +0200 +++ /var/tmp/diff_new_pack.v9awje/_new 2014-06-26 08:00:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.88 +Version: 3.1.96 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ YaST2-Firstboot.service ++++++ --- /var/tmp/diff_new_pack.v9awje/_old 2014-06-26 08:00:44.000000000 +0200 +++ /var/tmp/diff_new_pack.v9awje/_new 2014-06-26 08:00:44.000000000 +0200 @@ -9,7 +9,7 @@ Environment=SYSTEMCTL_OPTIONS=--ignore-dependencies TERM=linux ExecStartPre=-/usr/bin/plymouth --hide-splash ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot -ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system +ExecStartPost=/usr/bin/rm -f /var/lib/YaST2/reconfig_system ExecStartPost=/usr/bin/systemctl restart systemd-vconsole-setup.service TimeoutSec=0 RemainAfterExit=true ++++++ YaST2-Second-Stage.service ++++++ --- /var/tmp/diff_new_pack.v9awje/_old 2014-06-26 08:00:44.000000000 +0200 +++ /var/tmp/diff_new_pack.v9awje/_new 2014-06-26 08:00:44.000000000 +0200 @@ -11,7 +11,7 @@ ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage RemainAfterExit=yes TimeoutSec=0 -ExecStartPost=/bin/rm -f /var/lib/YaST2/runme_at_boot +ExecStartPost=/usr/bin/rm -f /var/lib/YaST2/runme_at_boot ExecStartPost=/usr/bin/systemctl restart systemd-vconsole-setup.service StandardInput=tty ++++++ yast2-installation-3.1.88.tar.bz2 -> yast2-installation-3.1.96.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.88/package/YaST2-Firstboot.service new/yast2-installation-3.1.96/package/YaST2-Firstboot.service --- old/yast2-installation-3.1.88/package/YaST2-Firstboot.service 2014-06-03 17:10:28.000000000 +0200 +++ new/yast2-installation-3.1.96/package/YaST2-Firstboot.service 2014-06-24 14:34:58.000000000 +0200 @@ -9,7 +9,7 @@ Environment=SYSTEMCTL_OPTIONS=--ignore-dependencies TERM=linux ExecStartPre=-/usr/bin/plymouth --hide-splash ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot -ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system +ExecStartPost=/usr/bin/rm -f /var/lib/YaST2/reconfig_system ExecStartPost=/usr/bin/systemctl restart systemd-vconsole-setup.service TimeoutSec=0 RemainAfterExit=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.88/package/YaST2-Second-Stage.service new/yast2-installation-3.1.96/package/YaST2-Second-Stage.service --- old/yast2-installation-3.1.88/package/YaST2-Second-Stage.service 2014-06-03 17:10:28.000000000 +0200 +++ new/yast2-installation-3.1.96/package/YaST2-Second-Stage.service 2014-06-24 14:34:58.000000000 +0200 @@ -11,7 +11,7 @@ ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage RemainAfterExit=yes TimeoutSec=0 -ExecStartPost=/bin/rm -f /var/lib/YaST2/runme_at_boot +ExecStartPost=/usr/bin/rm -f /var/lib/YaST2/runme_at_boot ExecStartPost=/usr/bin/systemctl restart systemd-vconsole-setup.service StandardInput=tty diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.88/package/yast2-installation.changes new/yast2-installation-3.1.96/package/yast2-installation.changes --- old/yast2-installation-3.1.88/package/yast2-installation.changes 2014-06-03 17:10:28.000000000 +0200 +++ new/yast2-installation-3.1.96/package/yast2-installation.changes 2014-06-24 14:34:58.000000000 +0200 @@ -1,4 +1,58 @@ ------------------------------------------------------------------- +Mon Jun 23 16:09:32 CEST 2014 - locilka(a)suse.com + +- Changed /bin/rm path to /usr/bin/rm path (bnc#882453) +- 3.1.96 + +------------------------------------------------------------------- +Mon Jun 23 13:02:27 UTC 2014 - jreidinger(a)suse.com + +- directly export autoyast profile to target file (bnc#881108) +- 3.1.95 + +------------------------------------------------------------------- +Thu Jun 19 19:05:10 UTC 2014 - lslezak(a)suse.cz + +- removed random_finish client, haveged service is by default + enabled, no need for explicit enabling by Yast + (gh#yast/yast-installation#214) +- 3.1.94 + +------------------------------------------------------------------- +Wed Jun 18 11:47:26 UTC 2014 - lslezak(a)suse.cz + +- make sure the CIO ignore config file ends with a new line + (bnc#883198) +- 3.1.93 + +------------------------------------------------------------------- +Tue Jun 17 12:34:33 UTC 2014 - lslezak(a)suse.cz + +- inst_upgrade_urls.rb: set the future target distribution to not + ignore the SCC online repositories in libzypp (bnc#881320) +- 3.1.92 + +------------------------------------------------------------------- +Mon Jun 16 12:33:18 UTC 2014 - jreidinger(a)suse.com + +- write list of active devices for cio_ignore ( partially written + by Ihno ) +- 3.1.91 + +------------------------------------------------------------------- +Thu Jun 12 15:20:04 UTC 2014 - jreidinger(a)suse.com + +- restore backup if yast failed during installation/upgrade + (bnc#882039) +- 3.1.90 + +------------------------------------------------------------------- +Thu Jun 12 08:27:01 UTC 2014 - lslezak(a)suse.cz + +- properly enable the add-on module in the installation workflow +- 3.1.89 + +------------------------------------------------------------------- Tue Jun 3 13:53:15 UTC 2014 - lslezak(a)suse.cz - inst_upgrade_urls.rb client: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.88/package/yast2-installation.spec new/yast2-installation-3.1.96/package/yast2-installation.spec --- old/yast2-installation-3.1.88/package/yast2-installation.spec 2014-06-03 17:10:28.000000000 +0200 +++ new/yast2-installation-3.1.96/package/yast2-installation.spec 2014-06-24 14:34:58.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.88 +Version: 3.1.96 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.88/src/Makefile.am new/yast2-installation-3.1.96/src/Makefile.am --- old/yast2-installation-3.1.88/src/Makefile.am 2014-06-03 17:10:28.000000000 +0200 +++ new/yast2-installation-3.1.96/src/Makefile.am 2014-06-24 14:34:58.000000000 +0200 @@ -62,7 +62,6 @@ clients/pre_umount_finish.rb \ clients/prep_shrink_finish.rb \ clients/proxy_finish.rb \ - clients/random_finish.rb \ clients/save_config_finish.rb \ clients/save_hw_status_finish.rb \ clients/ssh_settings_finish.rb \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.88/src/clients/clone_proposal.rb new/yast2-installation-3.1.96/src/clients/clone_proposal.rb --- old/yast2-installation-3.1.88/src/clients/clone_proposal.rb 2014-06-03 17:10:28.000000000 +0200 +++ new/yast2-installation-3.1.96/src/clients/clone_proposal.rb 2014-06-24 14:34:58.000000000 +0200 @@ -74,8 +74,10 @@ if param["force"] || @clone_settings.enabled? # keep mode, cloning set it to autoinst_config, but we need to continue # installation with original one(BNC#861520) + options = {} + options["target_path"] = param["target_path"] if param["target_path"] mode = Mode.mode - WFM.call "clone_system" + WFM.call("clone_system",[options]) Mode.SetMode(mode) end ret = true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.88/src/clients/inst_finish.rb new/yast2-installation-3.1.96/src/clients/inst_finish.rb --- old/yast2-installation-3.1.88/src/clients/inst_finish.rb 2014-06-03 17:10:28.000000000 +0200 +++ new/yast2-installation-3.1.96/src/clients/inst_finish.rb 2014-06-24 14:34:58.000000000 +0200 @@ -157,7 +157,6 @@ # product registration step is optional WFM.ClientExists("scc_finish") ? "scc" : "", "driver_update1", - "random", # bnc #340733 "system_settings" ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.88/src/clients/inst_proposal.rb new/yast2-installation-3.1.96/src/clients/inst_proposal.rb --- old/yast2-installation-3.1.88/src/clients/inst_proposal.rb 2014-06-03 17:10:28.000000000 +0200 +++ new/yast2-installation-3.1.96/src/clients/inst_proposal.rb 2014-06-24 14:34:58.000000000 +0200 @@ -222,12 +222,10 @@ # force write, so it always write profile even if user do not want # to store profile after installation - WFM.CallFunction("clone_proposal", ["Write", "force" => true]) - if !File.exists?("/root/autoinst.xml") + WFM.CallFunction("clone_proposal", ["Write", "force" => true, "target_path" => path]) + if !File.exists?(path) raise _("Failed to store configuration. Details can be found in log.") end - - WFM.Execute(path(".local.bash"), "mv -- /root/autoinst.xml '#{String.Quote(path)}'") when :skip, :dontskip if Convert.to_boolean(UI.QueryWidget(Id(:skip), :Value)) # User doesn't want to use any of the settings diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.88/src/clients/inst_upgrade_urls.rb new/yast2-installation-3.1.96/src/clients/inst_upgrade_urls.rb --- old/yast2-installation-3.1.88/src/clients/inst_upgrade_urls.rb 2014-06-03 17:10:28.000000000 +0200 +++ new/yast2-installation-3.1.96/src/clients/inst_upgrade_urls.rb 2014-06-24 14:34:58.000000000 +0200 @@ -849,7 +849,8 @@ # force reloading the libzypp repomanager to notice the removed files Pkg.TargetFinish - Pkg.TargetInitialize(Installation.destdir) + Pkg.TargetInitializeOptions(Installation.destdir, + "target_distro" => target_distribution) Pkg.TargetLoad end @@ -1300,6 +1301,21 @@ :next end + + private + + # TODO FIXME: share this code better + def target_distribution + base_products = Product.FindBaseProducts + + # empty target distribution disables service compatibility check in case + # the base product cannot be found + target_distro = base_products ? base_products.first["register_target"] : "" + log.info "Base product target distribution: #{target_distro}" + + target_distro + end + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.88/src/clients/random_finish.rb new/yast2-installation-3.1.96/src/clients/random_finish.rb --- old/yast2-installation-3.1.88/src/clients/random_finish.rb 2014-06-03 17:10:28.000000000 +0200 +++ new/yast2-installation-3.1.96/src/clients/random_finish.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,113 +0,0 @@ -# encoding: utf-8 - -# ------------------------------------------------------------------------------ -# Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. -# -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of version 2 of the GNU General Public License as published by the -# Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, contact Novell, Inc. -# -# To contact Novell about this file by physical or electronic mail, you may find -# current contact information at www.novell.com. -# ------------------------------------------------------------------------------ - -# File: random_finish.ycp -# -# Module: Handle haveged service and preserve the current randomness state -# -# Authors: Lukas Ocilka <locilka(a)suse.cz> -# -# $Id$ - -require "installation/minimal_installation" - -module Yast - class RandomFinishClient < Client - def main - textdomain "installation" - - Yast.import "FileUtils" - Yast.import "Service" - - @ret = nil - @func = "" - @param = {} - - if Ops.greater_than(Builtins.size(WFM.Args), 0) && - Ops.is_string?(WFM.Args(0)) - @func = Convert.to_string(WFM.Args(0)) - if Ops.greater_than(Builtins.size(WFM.Args), 1) && - Ops.is_map?(WFM.Args(1)) - @param = Convert.to_map(WFM.Args(1)) - end - end - - Builtins.y2milestone("starting random_finish") - Builtins.y2debug("func=%1", @func) - Builtins.y2debug("param=%1", @param) - - if @func == "Info" - minimal_inst = ::Installation::MinimalInstallation.instance.enabled? - return { - "steps" => 1, - # progress step title - "title" => _( - "Enabling random number generator..." - ), - "when" => minimal_inst ? [] : - [:installation, :live_installation, :update, :autoinst] - } - elsif @func == "Write" - @init_path = "/etc/init.d/" - @init_service = "haveged" - - # The generator of randomness should be always enabled if possible - if FileUtils.Exists( - Builtins.sformat("%1/%2", @init_path, @init_service) - ) - Builtins.y2milestone("Enabling service %1", @init_service) - @ret = Service.Enable(@init_service) - else - Builtins.y2warning( - "Cannot enable service %1, %2 is not installed", - @init_service, - Builtins.sformat("%1/%2", @init_path, @init_service) - ) - end - else - Builtins.y2error("unknown function: %1", @func) - @ret = nil - end - - Builtins.y2debug("ret=%1", @ret) - Builtins.y2milestone("random_finish finished") - - deep_copy(@ret) - end - - # Calls a local command and returns if successful - def LocalCommand(command) - cmd = Convert.to_map(WFM.Execute(path(".local.bash_output"), command)) - Builtins.y2milestone("Command %1 returned: %2", command, cmd) - - if Ops.get_integer(cmd, "exit", -1) == 0 - return true - else - if Ops.get_string(cmd, "stderr", "") != "" - Builtins.y2error("Error: %1", Ops.get_string(cmd, "stderr", "")) - end - return false - end - end - end -end - -Yast::RandomFinishClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.88/src/include/installation/inst_inc_first.rb new/yast2-installation-3.1.96/src/include/installation/inst_inc_first.rb --- old/yast2-installation-3.1.88/src/include/installation/inst_inc_first.rb 2014-06-03 17:10:28.000000000 +0200 +++ new/yast2-installation-3.1.96/src/include/installation/inst_inc_first.rb 2014-06-24 14:34:58.000000000 +0200 @@ -85,9 +85,9 @@ addons_default ) if show_addons - ProductControl.DisableModule("add-on") - else ProductControl.EnableModule("add-on") + else + ProductControl.DisableModule("add-on") end Installation.add_on_selected = addons_default @@ -139,7 +139,7 @@ "Directory '%1' exists, removing...", String.Quote(zypp_data_item) ) - bashcmd = Builtins.sformat("/bin/rm -rf '%1'", zypp_data_item) + bashcmd = Builtins.sformat("/usr/bin/rm -rf '%1'", zypp_data_item) Builtins.y2milestone( "Result: %1", WFM.Execute(path(".local.bash_output"), bashcmd) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.88/src/lib/installation/cio_ignore.rb new/yast2-installation-3.1.96/src/lib/installation/cio_ignore.rb --- old/yast2-installation-3.1.88/src/lib/installation/cio_ignore.rb 2014-06-03 17:10:28.000000000 +0200 +++ new/yast2-installation-3.1.96/src/lib/installation/cio_ignore.rb 2014-06-24 14:34:58.000000000 +0200 @@ -153,6 +153,9 @@ # blacklisted (fate#315318) add_boot_kernel_parameters + # store activelly used devices to not be blocked + store_active_devices + nil else raise "Uknown action #{func} passed as first parameter" @@ -173,5 +176,24 @@ raise "failed to write kernel parameters for IPL and console device" end end + + ACTIVE_DEVICES_FILE = "/boot/zipl/active_devices.txt" + def store_active_devices + Yast.import "Installation" + res = Yast::SCR.Execute(YAST_BASH_PATH, "cio_ignore -L") + log.info "active devices: #{res}" + + raise "cio_ignore -L failed with #{res["stderr"]}" if res["exit"] != 0 + #lets select only lines that looks like device. Regexp is not perfect, but good enough + devices_lines = res["stdout"].lines.grep(/^(?:\h.){0,2}\h{4}.*$/) + + devices = devices_lines.map(&:chomp) + target_file = File.join(Yast::Installation.destdir, ACTIVE_DEVICES_FILE) + + # make sure the file ends with a new line character + devices << "" unless devices.empty? + + File.write(target_file, devices.join("\n")) + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.88/src/modules/Vendor.rb new/yast2-installation-3.1.96/src/modules/Vendor.rb --- old/yast2-installation-3.1.88/src/modules/Vendor.rb 2014-06-03 17:10:28.000000000 +0200 +++ new/yast2-installation-3.1.96/src/modules/Vendor.rb 2014-06-24 14:34:58.000000000 +0200 @@ -65,7 +65,7 @@ Builtins.y2milestone("Extracting driver update...") # clean up, just in case - SCR.Execute(path(".target.bash"), "/bin/rm -rf /tmp/update") + SCR.Execute(path(".target.bash"), "/usr/bin/rm -rf /tmp/update") # copy log file WFM.Execute( @@ -182,7 +182,7 @@ ) # remove driver update dir - SCR.Execute(path(".target.bash"), "/bin/rm -rf /tmp/update") + SCR.Execute(path(".target.bash"), "/usr/bin/rm -rf /tmp/update") nil end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.88/startup/YaST2.call new/yast2-installation-3.1.96/startup/YaST2.call --- old/yast2-installation-3.1.88/startup/YaST2.call 2014-06-03 17:10:28.000000000 +0200 +++ new/yast2-installation-3.1.96/startup/YaST2.call 2014-06-24 14:34:58.000000000 +0200 @@ -275,6 +275,16 @@ } +#----[ restore_backup ]----# +function restore_backup () { + # restores backup if it is available + if [ -d /mnt/var/adm/backup/system-upgrade ]; then + for i in /mnt/var/adm/backup/system-upgrade/*.tar.bz2; do + tar xvf $i -C /mnt --overwrite + done + fi +} + #----[ start_yast ]----# function start_yast () { #------------------------------------------------------ @@ -336,6 +346,7 @@ cat /etc/yast.inf | grep -q -i "Aborted: 1" if [ $? = 0 ];then log "\t$Y2_ABORT_MESSAGE" + restore_backup fi else #============================================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.88/test/cio_ignore_test.rb new/yast2-installation-3.1.96/test/cio_ignore_test.rb --- old/yast2-installation-3.1.88/test/cio_ignore_test.rb 2014-06-03 17:10:28.000000000 +0200 +++ new/yast2-installation-3.1.96/test/cio_ignore_test.rb 2014-06-24 14:34:58.000000000 +0200 @@ -106,6 +106,7 @@ describe "first parameter \"Write\"" do before(:each) do + stub_const("Yast::Installation", double(:destdir => "/mnt")) stub_const("Yast::Bootloader", double()) allow(Yast::Bootloader).to receive(:Write) { true } @@ -113,8 +114,9 @@ allow(Yast::Bootloader).to receive(:modify_kernel_params) { true } allow(Yast::SCR).to receive(:Execute). - once. and_return({"exit" => 0, "stdout" => "", "stderr" => ""}) + + allow(File).to receive(:write) end describe "Device blacklisting is disabled" do @@ -176,6 +178,45 @@ expect{subject.run("Write")}.to raise_error(RuntimeError, /failed to write kernel parameters/) end + + it "writes list of active devices to zipl so it is not blocked" do + test_output = <<-EOL +Devices that are not ignored: +============================= +0.0.0160 +0.0.01c0 +0.0.0700-0.0.0702 +0.0.fc00 + EOL + expect(Yast::SCR).to receive(:Execute). + with( + ::Installation::CIOIgnoreFinish::YAST_BASH_PATH, + "cio_ignore -L" + ). + once. + and_return({"exit" => 0, "stdout" => test_output, "stderr" => ""}) + + + expect(File).to receive(:write).once do |file, content| + expect(file).to eq("/mnt/boot/zipl/active_devices.txt") + expect(content).to match(/0.0.0700-0.0.0702/) + expect(content).to end_with("\n") + end + + subject.run("Write") + end + + it "raises an exception if cio_ignore -L failed" do + expect(Yast::SCR).to receive(:Execute). + with( + ::Installation::CIOIgnoreFinish::YAST_BASH_PATH, + "cio_ignore -L" + ). + once. + and_return({"exit" => 1, "stdout" => "", "stderr" => "FAIL"}) + + expect{subject.run("Write")}.to raise_error(RuntimeError, /cio_ignore -L failed/) + end end end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-network for openSUSE:Factory
by root＠hilbert.suse.de 26 Jun '14

26 Jun '14

Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2014-06-26 08:00:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-network (Old) and /work/SRC/openSUSE:Factory/.yast2-network.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2014-06-18 10:59:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2014-06-26 08:00:41.000000000 +0200 @@ -1,0 +2,22 @@ +Tue Jun 24 10:00:47 CEST 2014 - schubi(a)suse.de + +- bnc#883718 + Taking wicked as default in autoyast installation. +- 3.1.67 + +------------------------------------------------------------------- +Sat Jun 21 19:17:43 UTC 2014 - mfilka(a)suse.com + +- bnc#878719 + - active network service selected properly +- 3.1.66 + +------------------------------------------------------------------- +Thu Jun 19 11:53:55 UTC 2014 - mfilka(a)suse.com + +- bnc#879617 + - fixed generated bridge port configuration + - tun device is not allowed as bridge port anymore +- 3.1.65 + +------------------------------------------------------------------- Old: ---- yast2-network-3.1.64.tar.bz2 New: ---- yast2-network-3.1.67.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.eqkwfH/_old 2014-06-26 08:00:42.000000000 +0200 +++ /var/tmp/diff_new_pack.eqkwfH/_new 2014-06-26 08:00:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.64 +Version: 3.1.67 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.64.tar.bz2 -> yast2-network-3.1.67.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.64/package/yast2-network.changes new/yast2-network-3.1.67/package/yast2-network.changes --- old/yast2-network-3.1.64/package/yast2-network.changes 2014-06-16 14:58:49.000000000 +0200 +++ new/yast2-network-3.1.67/package/yast2-network.changes 2014-06-24 14:32:20.000000000 +0200 @@ -1,4 +1,26 @@ ------------------------------------------------------------------- +Tue Jun 24 10:00:47 CEST 2014 - schubi(a)suse.de + +- bnc#883718 + Taking wicked as default in autoyast installation. +- 3.1.67 + +------------------------------------------------------------------- +Sat Jun 21 19:17:43 UTC 2014 - mfilka(a)suse.com + +- bnc#878719 + - active network service selected properly +- 3.1.66 + +------------------------------------------------------------------- +Thu Jun 19 11:53:55 UTC 2014 - mfilka(a)suse.com + +- bnc#879617 + - fixed generated bridge port configuration + - tun device is not allowed as bridge port anymore +- 3.1.65 + +------------------------------------------------------------------- Sat Jun 14 20:20:57 UTC 2014 - mfilka(a)suse.com - bnc#880167 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.64/package/yast2-network.spec new/yast2-network-3.1.67/package/yast2-network.spec --- old/yast2-network-3.1.64/package/yast2-network.spec 2014-06-16 14:58:49.000000000 +0200 +++ new/yast2-network-3.1.67/package/yast2-network.spec 2014-06-24 14:32:20.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.64 +Version: 3.1.67 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.64/src/include/network/lan/bridge.rb new/yast2-network-3.1.67/src/include/network/lan/bridge.rb --- old/yast2-network-3.1.64/src/include/network/lan/bridge.rb 2014-06-16 14:58:49.000000000 +0200 +++ new/yast2-network-3.1.67/src/include/network/lan/bridge.rb 2014-06-24 14:32:20.000000000 +0200 @@ -28,6 +28,8 @@ # module Yast module NetworkLanBridgeInclude + include Logger + def initialize_network_lan_bridge(include_target) textdomain "network" end @@ -37,10 +39,8 @@ # # @param [String] key id of the widget def InitBridge(key) - br_ports = Builtins.splitstring( - Ops.get_string(NetworkInterfaces.Current, "BRIDGE_PORTS", ""), - " " - ) + br_ports = (NetworkInterfaces.Current["BRIDGE_PORTS"] || "").split + items = CreateSlaveItems( LanItems.GetBridgeableInterfaces(LanItems.GetCurrentName), br_ports @@ -51,111 +51,48 @@ nil end + def configure_as_bridge_port(device) + log.info("Adapt device #{device} as bridge port") + + # when using wicked every device which can be bridged + # can be set to BOOTPROTO=none. No workaround with + # BOOTPROTO=static required anymore + NetworkInterfaces.Edit(device) + NetworkInterfaces.Current["IPADDR"] = "" + NetworkInterfaces.Current["NETMASK"] = "" + NetworkInterfaces.Current["BOOTPROTO"] = "none" + NetworkInterfaces.Commit + NetworkInterfaces.Add + end + def ValidateBridge(key, event) - event = deep_copy(event) - old_name = NetworkInterfaces.Name - valid = true - confirmed = false - items = Convert.convert( - UI.QueryWidget(Id(key), :Items), - :from => "any", - :to => "list <term>" - ) - sel = Convert.convert( - UI.QueryWidget(Id("BRIDGE_PORTS"), :SelectedItems), - :from => "any", - :to => "list <string>" - ) - confs = [] + sel = UI.QueryWidget(Id("BRIDGE_PORTS"), :SelectedItems) + configurations = NetworkInterfaces.FilterDevices("netcard") - Builtins.foreach( - Builtins.splitstring( - Ops.get(NetworkInterfaces.CardRegex, "netcard", ""), - "|" - ) - ) do |devtype| - confs = Convert.convert( - Builtins.union( - confs, - Map.Keys(Ops.get_map(configurations, devtype, {})) - ), - :from => "list", - :to => "list <string>" - ) + netcard_types = (NetworkInterfaces.CardRegex["netcard"] || "").split("|") + + confs = netcard_types.reduce([]) do |res, devtype| + res.concat((configurations[devtype] || {}).keys) end - Builtins.foreach(items) do |t| - device = Ops.get_string(t, [0, 0], "") - if Builtins.contains(sel, device) && IsNotEmpty(device) - if Builtins.contains(confs, device) - # allow to add bonding device into bridge and also device with mask /32(bnc#405343) - if Builtins.contains( - ["tun", "tap"], - NetworkInterfaces.GetType(device) + + valid = true + confirmed = false + + sel.each do |device| + next if !confs.include?(device) + + dev_type = NetworkInterfaces.GetType(device) + ifcfg_conf = configurations[dev_type][device] + + if ifcfg_conf["BOOTPROTO"] != "none" && !confirmed + valid = Popup.ContinueCancel( + _( + "At least one selected device is already configured.\nAdapt the configuration for bridge?\n" ) - next - end - if Builtins.contains(["bond"], NetworkInterfaces.GetType(device)) - if LanItems.operation == :add - old_name2 = NetworkInterfaces.Name - NetworkInterfaces.Edit(device) - Ops.set(NetworkInterfaces.Current, "IPADDR", "0.0.0.0") - Ops.set(NetworkInterfaces.Current, "NETMASK", "255.255.255.255") - Ops.set(NetworkInterfaces.Current, "BOOTPROTO", "static") - NetworkInterfaces.Commit - NetworkInterfaces.Add - end - next - end - if Ops.get_string( - configurations, - [NetworkInterfaces.GetType(device), device, "PREFIXLEN"], - "" - ) != "32" || - Ops.get_string( - configurations, - [NetworkInterfaces.GetType(device), device, "NETMASK"], - "" - ) != "255.255.255.255" - if Ops.get_string( - configurations, - [NetworkInterfaces.GetType(device), device, "IPADDR"], - "" - ) != "0.0.0.0" && - Ops.get_string( - configurations, - [NetworkInterfaces.GetType(device), device, "BOOTPROTO"], - "" - ) != "none" - if !confirmed - valid = Popup.ContinueCancel( - _( - "At least one selected device is already configured.\nAdapt the configuration for bridge (IP address 0.0.0.0/32)?\n" - ) - ) - confirmed = true - end - if valid - i = LanItems.current - if LanItems.FindAndSelect(device) - Builtins.y2internal( - "Adapt device %1 for bridge (0.0.0.0/32)", - device - ) - NetworkInterfaces.Edit(device) - Ops.set(NetworkInterfaces.Current, "IPADDR", "0.0.0.0") - Ops.set(NetworkInterfaces.Current, "PREFIXLEN", "32") - Ops.set(NetworkInterfaces.Current, "BOOTPROTO", "static") - NetworkInterfaces.Commit - NetworkInterfaces.Add - LanItems.current = i - end - end - end - end - end + ) + confirmed = true end end - NetworkInterfaces.Select(old_name) valid end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.64/src/include/network/widgets.rb new/yast2-network-3.1.67/src/include/network/widgets.rb --- old/yast2-network-3.1.64/src/include/network/widgets.rb 2014-06-16 14:58:49.000000000 +0200 +++ new/yast2-network-3.1.67/src/include/network/widgets.rb 2014-06-24 14:32:20.000000000 +0200 @@ -292,14 +292,13 @@ # @param [String] key id of the widget def ManagedInit(key) items = [] - any_service_active = false if NetworkService.is_backend_available(:network_manager) items << Item( Id("managed"), # the user can control the network with the NetworkManager program _("NetworkManager Service"), - any_service_active = NetworkService.is_network_manager + NetworkService.is_network_manager ) end if NetworkService.is_backend_available(:netconfig) @@ -307,7 +306,7 @@ Id("ifup"), # ifup is a program name _("Traditional ifup"), - any_service_active = NetworkService.is_netconfig + NetworkService.is_netconfig ) end if NetworkService.is_backend_available(:wicked) @@ -315,7 +314,7 @@ Id("wicked"), # wicked is network configuration backend like netconfig _("Wicked Service"), - any_service_active = NetworkService.is_wicked + NetworkService.is_wicked ) end @@ -323,7 +322,7 @@ Id("disabled"), # used when no network service is active or to disable network service _("Network Services Disabled"), - !any_service_active + NetworkService.is_disabled ) UI.ChangeWidget(Id(:managed), :Items, items) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.64/src/modules/Lan.rb new/yast2-network-3.1.67/src/modules/Lan.rb --- old/yast2-network-3.1.64/src/modules/Lan.rb 2014-06-16 14:58:49.000000000 +0200 +++ new/yast2-network-3.1.67/src/modules/Lan.rb 2014-06-24 14:32:20.000000000 +0200 @@ -702,7 +702,7 @@ if Ops.get_boolean(settings, "managed", false) NetworkService.use_network_manager else - NetworkService.use_netconfig + NetworkService.use_wicked end if Builtins.haskey(settings, "ipv6") @ipv6 = Ops.get_boolean(settings, "ipv6", true) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.64/src/modules/LanItems.rb new/yast2-network-3.1.67/src/modules/LanItems.rb --- old/yast2-network-3.1.64/src/modules/LanItems.rb 2014-06-16 14:58:49.000000000 +0200 +++ new/yast2-network-3.1.67/src/modules/LanItems.rb 2014-06-24 14:32:20.000000000 +0200 @@ -42,6 +42,7 @@ Yast.include self, "network/routines.rb" Yast.include self, "network/lan/s390.rb" Yast.include self, "network/lan/udev.rb" + Yast.include self, "network/lan/bridge.rb" # Hardware information # @see #ReadHardware @@ -323,14 +324,14 @@ # # First it looks into the item's netconfig and if it doesn't exist # it uses device name from hwinfo if available. - def GetDeviceName(itemId) - lanItem = GetLanItem(itemId) + def GetDeviceName(item_id) + lan_item = GetLanItem(item_id) - Ops.get_string( - lanItem, - "ifcfg", - Ops.get_string(lanItem, ["hwinfo", "dev_name"], "") - ) + return lan_item["ifcfg"] if lan_item["ifcfg"] + return lan_item["hwinfo"]["dev_name"] || "" if lan_item["hwinfo"] + + log.error("Item #{item_id} has no dev_name nor configuration associated") + return "" # this should never happen end # Returns name which is going to be used in the udev rule @@ -823,34 +824,31 @@ devname = GetDeviceName(itemId) bonded = BuildBondIndex() - if bonded[ devname] - Builtins.y2debug( - "IsBridgeable: excluding lan item (#{itemId}: #{devname}) - is bonded", - ) + if bonded[devname] + log.debug("Excluding lan item (#{itemId}: #{devname}) - is bonded") return false end devtype = GetDeviceType(itemId) # exclude forbidden configurations - if devtype == "br" - Builtins.y2debug( - "IsBridgeable: excluding lan item (#{itemId}: #{devname}) - is bridge", - ) - return false + case devtype + when "br" + log.debug("Excluding lan item (#{itemId}: #{devname}) - is bridge") + return false + + when "tun" + log.debug("Excluding lan item (#{itemId}: #{devname}) - is tun") + return false end - case ifcfg[ "STARTMODE"] + case ifcfg["STARTMODE"] when "nfsroot" - Builtins.y2debug( - "IsBridgeable: excluding lan item (#{itemId}: #{devname}) - is nfsroot", - ) + log.debug("Excluding lan item (#{itemId}: #{devname}) - is nfsroot") return false when "ifplugd" - Builtins.y2debug( - "IsBridgeable: excluding lan item (#{itemId}: #{devname}) - ifplugd", - ) + log.debug("Excluding lan item (#{itemId}: #{devname}) - ifplugd") return false else @@ -943,21 +941,15 @@ end end + def find_configured(device) + @Items.select { |k,v| v["ifcfg"] == device }.keys.first + end + def FindAndSelect(device) - found = false - Builtins.foreach( - Convert.convert( - @Items, - :from => "map <integer, any>", - :to => "map <integer, map <string, any>>" - ) - ) do |i, a| - if Ops.get_string(a, "ifcfg", "") == device - found = true - @current = i - end - end - found + item_id = find_configured(device) + @current = item_id if item_id + + return !item_id.nil? end # search all known devices to find it's index in Items array @@ -2126,6 +2118,11 @@ Ops.set(@Items, [@current, "ifcfg"], "") if !NetworkInterfaces.Commit + # configure bridge ports + if @bridge_ports + @bridge_ports.split.each { |bp| configure_as_bridge_port(bp) } + end + @modified = true @operation = nil true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.64/test/bridge_test.rb new/yast2-network-3.1.67/test/bridge_test.rb --- old/yast2-network-3.1.64/test/bridge_test.rb 2014-06-16 14:58:49.000000000 +0200 +++ new/yast2-network-3.1.67/test/bridge_test.rb 2014-06-24 14:32:20.000000000 +0200 @@ -60,8 +60,7 @@ "eth4", "eth11", "eth12", - "tap0", - "tun0" + "tap0" ] before(:each) do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.64/test/netcard_test.rb new/yast2-network-3.1.67/test/netcard_test.rb --- old/yast2-network-3.1.64/test/netcard_test.rb 2014-06-16 14:58:49.000000000 +0200 +++ new/yast2-network-3.1.67/test/netcard_test.rb 2014-06-24 14:32:20.000000000 +0200 @@ -64,7 +64,7 @@ "name" => "SUSE test card", "dev_name" => "enp0s3" } - }, + } } require "yast" @@ -82,7 +82,7 @@ # mocking only neccessary parts of Yast::LanItems so we need not to call # and mock inputs for Yast::LanItems.Read here - @lan_items.Items = MOCKED_ITEMS + @lan_items.Items = deep_copy(MOCKED_ITEMS) end it "returns empty list when querying device name with nil or empty input" do @@ -140,7 +140,7 @@ before(:each) do @lan_items = Yast::LanItems @lan_items.main - @lan_items.Items = MOCKED_ITEMS + @lan_items.Items = deep_copy(MOCKED_ITEMS) end it "returns description and uses custom name if present" do @@ -185,7 +185,7 @@ before(:each) do @lan_items = Yast::LanItems @lan_items.main - @lan_items.Items = MOCKED_ITEMS + @lan_items.Items = deep_copy(MOCKED_ITEMS) end it "removes an existing item" do @@ -215,3 +215,39 @@ expect((a)lan_items.Items.size).to eql before_size end end + +describe "LanItemsClass#GetItemName" do + before(:each) do + @lan_items = Yast::LanItems + @lan_items.main + @lan_items.Items = deep_copy(MOCKED_ITEMS) + end + + it "returns name provided by hwinfo if not configured" do + MOCKED_ITEMS.select { |k,v| !v.has_key?("ifcfg") }.each_pair do |item_id, conf| + expect((a)lan_items.GetDeviceName(item_id)).to eql conf["hwinfo"]["dev_name"] + end + end + + it "returns name according configuration if available" do + MOCKED_ITEMS.select { |k,v| v.has_key?("ifcfg") }.each_pair do |item_id, conf| + expect((a)lan_items.GetDeviceName(item_id)).to eql conf["ifcfg"] + end + end +end + +describe "LanItemsClass#FindAndSelect" do + before(:each) do + @lan_items = Yast::LanItems + @lan_items.main + @lan_items.Items = deep_copy(MOCKED_ITEMS) + end + + it "finds configured device" do + expect((a)lan_items.FindAndSelect("enp0s3")).to be_true + end + + it "fails to find unconfigured device" do + expect((a)lan_items.FindAndSelect("nonexistent")).to be_false + end +end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit snapper for openSUSE:Factory
by root＠hilbert.suse.de 26 Jun '14

26 Jun '14

Hello community, here is the log from the commit of package snapper for openSUSE:Factory checked in at 2014-06-26 08:00:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/snapper (Old) and /work/SRC/openSUSE:Factory/.snapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "snapper" Changes: -------- --- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2014-06-10 14:37:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2014-06-26 08:00:39.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jun 23 09:19:03 CEST 2014 - aschnell(a)suse.de + +- fixed DBus introspection data +- version 0.2.3 + +------------------------------------------------------------------- Old: ---- snapper-0.2.2.tar.bz2 New: ---- snapper-0.2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper.spec ++++++ --- /var/tmp/diff_new_pack.gTcOWo/_old 2014-06-26 08:00:40.000000000 +0200 +++ /var/tmp/diff_new_pack.gTcOWo/_new 2014-06-26 08:00:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: snapper -Version: 0.2.2 +Version: 0.2.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: snapper-%{version}.tar.bz2 ++++++ snapper-0.2.2.tar.bz2 -> snapper-0.2.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.2/VERSION new/snapper-0.2.3/VERSION --- old/snapper-0.2.2/VERSION 2014-04-16 12:33:22.000000000 +0200 +++ new/snapper-0.2.3/VERSION 2014-06-24 11:07:29.000000000 +0200 @@ -1 +1 @@ -0.2.2 +0.2.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.2/server/Client.cc new/snapper-0.2.3/server/Client.cc --- old/snapper-0.2.2/server/Client.cc 2014-04-17 15:27:38.000000000 +0200 +++ new/snapper-0.2.3/server/Client.cc 2014-06-23 09:25:37.000000000 +0200 @@ -272,7 +272,7 @@ " <method name='CreateSingleSnapshotV2'>\n" " <arg name='config-name' type='s' direction='in'/>\n" " <arg name='parent-number' type='u' direction='in'/>\n" - " <arg name='read-only' type 'b' direction='in'/>\n" + " <arg name='read-only' type='b' direction='in'/>\n" " <arg name='description' type='s' direction='in'/>\n" " <arg name='cleanup' type='s' direction='in'/>\n" " <arg name='userdata' type='a{ss}' direction='in'/>\n" @@ -281,7 +281,7 @@ " <method name='CreateSingleSnapshotOfDefault'>\n" " <arg name='config-name' type='s' direction='in'/>\n" - " <arg name='read-only' type 'b' direction='in'/>\n" + " <arg name='read-only' type='b' direction='in'/>\n" " <arg name='description' type='s' direction='in'/>\n" " <arg name='cleanup' type='s' direction='in'/>\n" " <arg name='userdata' type='a{ss}' direction='in'/>\n" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit postfix for openSUSE:Factory
by root＠hilbert.suse.de 26 Jun '14

26 Jun '14

Hello community, here is the log from the commit of package postfix for openSUSE:Factory checked in at 2014-06-26 08:00:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postfix (Old) and /work/SRC/openSUSE:Factory/.postfix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "postfix" Changes: -------- --- /work/SRC/openSUSE:Factory/postfix/postfix.changes 2014-02-17 13:04:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.postfix.new/postfix.changes 2014-06-26 08:00:36.000000000 +0200 @@ -1,0 +2,34 @@ +Mon Jun 23 21:41:23 UTC 2014 - jamesp(a)vicidial.com + +- The included postfix-mysql.tar.bz2 was using a MySQL 4.1 style of + table engine specification. Modified so that the sql uses + 'ENGINE=' instead of 'TYPE=' for creating tables. + +------------------------------------------------------------------- +Mon Jun 23 15:17:52 UTC 2014 - varkoly(a)suse.com + +- bnc#816769 - config.postfix issues warnings about missing master.cf + +------------------------------------------------------------------- +Tue Jun 10 13:34:03 UTC 2014 - varkoly(a)suse.com + +- bnc#882033 - Package postfix has changed files according to rpm +- bnc#855688 - possible systemd bug: postfix & cifs dependency confict + +------------------------------------------------------------------- +Mon Jun 9 12:17:35 UTC 2014 - varkoly(a)suse.com + +- bnc#863350 - SuSEconfig.postfix complains about modified /etc/postfix/main.cf after updating postfix + +------------------------------------------------------------------- +Mon May 26 17:21:54 UTC 2014 - chris(a)computersalat.de + +- replace vda patch: + * add postfix-vda-v13-2.10.0.patch + * remove postfix-vda-v11-2.9.6.patch +- rebase patches +- config.postfix + * add master.cf support for submission (587) + * rework master.cf support for smtps + +------------------------------------------------------------------- Old: ---- postfix-vda-v11-2.9.6.patch New: ---- postfix-vda-v13-2.10.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix.spec ++++++ --- /var/tmp/diff_new_pack.IWTByh/_old 2014-06-26 08:00:38.000000000 +0200 +++ /var/tmp/diff_new_pack.IWTByh/_new 2014-06-26 08:00:38.000000000 +0200 @@ -31,7 +31,7 @@ Source4: %{name}.keyring Source10: rpmlintrc Source11: check_mail_queue -Patch: dynamic_maps.patch +Patch0: dynamic_maps.patch Patch1: dynamic_maps_pie.patch Patch2: pointer_to_literals.patch Patch3: ipv6_disabled.patch @@ -40,7 +40,7 @@ Patch12: %{name}-post-install.patch Patch20: %{name}-ssl-release-buffers.patch Patch21: postfix-opensslconfig.patch -Patch100: %{name}-vda-v11-2.9.6.patch +Patch100: %{name}-vda-v13-2.10.0.patch Patch101: postfix-db6.diff #PATCH-FIX-SLE PATCH-FIX-OPENSUSE to be able to build the agent tls_proxy Patch102: add_missed_library.patch @@ -158,7 +158,7 @@ %prep %{?gpg_verify: %gpg_verify %{S:1}} %setup -q -a 2 -a 3 -%patch -p1 +%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 @@ -166,10 +166,10 @@ %patch11 %patch12 %patch20 -%patch21 -p1 +%patch21 %patch100 -p1 -%patch -P 101 -p1 -%patch102 -p0 +%patch101 +%patch102 # --------------------------------------------------------------------------- %build @@ -415,10 +415,33 @@ %post # We never have to run suseconfig for postfix after installation # We only start postfix own upgrade-configuration by update -/usr/sbin/postfix set-permissions || : if [ ${1:-0} -gt 1 ]; then touch /var/adm/postfix.configured - /usr/sbin/postfix upgrade-configuration || : + # Check if main.cf and master.cf was changed manualy + MAINCH=0 + if [ -e /var/adm/SuSEconfig/md5/etc/postfix/main.cf ]; then + MD5SUM1=$( cat /var/adm/SuSEconfig/md5/etc/postfix/main.cf ) + MD5SUM2=$( grep -v "^#" /etc/postfix/main.cf | md5sum ) + if [ "$MD5SUM1" != "$MD5SUM2" ]; then + MAINCH=1 + fi + fi + MASTERCH=0 + if [ -e /var/adm/SuSEconfig/md5/etc/postfix/master.cf ]; then + MD5SUM1=$( cat /var/adm/SuSEconfig/md5/etc/postfix/master.cf ) + MD5SUM2=$( grep -v "^#" /etc/postfix/master.cf | md5sum ) + if [ "$MD5SUM1" != "$MD5SUM2" ]; then + MASTERCH=1 + fi + fi + echo "Executing upgrade-configuration." + /usr/sbin/postfix set-permissions upgrade-configuration setgid_group=%{pf_setgid_group} + if [ $MASTERCH -eq 0 ]; then + test -e /var/adm/SuSEconfig/md5/etc/postfix/master.cf && grep -v "^#" /etc/postfix/master.cf | md5sum > /var/adm/SuSEconfig/md5/etc/postfix/master.cf + fi + if [ $MAINCH -eq 0 ]; then + test -e /var/adm/SuSEconfig/md5/etc/postfix/main.cf && grep -v "^#" /etc/postfix/main.cf | md5sum > /var/adm/SuSEconfig/md5/etc/postfix/main.cf + fi fi %{fillup_and_insserv -y postfix} %{fillup_only -an mail} @@ -522,7 +545,7 @@ %{conf_backup_dir} %dir %attr(0700,%{name},root) %{pf_data_directory} %{_mandir}/man?/*.gz -%dir %attr(0755,%{name},root) /%{pf_queue_directory} +%dir %attr(0755,root,root) /%{pf_queue_directory} %dir %attr(0700,%{name},root) /%{pf_queue_directory}/active %dir %attr(0700,%{name},root) /%{pf_queue_directory}/bounce %dir %attr(0700,%{name},root) /%{pf_queue_directory}/corrupt ++++++ add_missed_library.patch ++++++ --- /var/tmp/diff_new_pack.IWTByh/_old 2014-06-26 08:00:38.000000000 +0200 +++ /var/tmp/diff_new_pack.IWTByh/_new 2014-06-26 08:00:38.000000000 +0200 @@ -1,6 +1,8 @@ ---- src/tlsproxy/Makefile.in.orig 2014-02-12 15:41:35.614464191 +0100 -+++ src/tlsproxy/Makefile.in 2014-02-12 15:42:14.445752897 +0100 -@@ -9,7 +9,7 @@ +Index: src/tlsproxy/Makefile.in +=================================================================== +--- src/tlsproxy/Makefile.in.orig ++++ src/tlsproxy/Makefile.in +@@ -9,7 +9,7 @@ TESTPROG= PROG = tlsproxy INC_DIR = ../../include LIBS = ../../lib/libtls.a ../../lib/libmaster.a ../../lib/libglobal.a \ @@ -9,4 +11,3 @@ .c.o:; $(CC) $(CFLAGS) -c $*.c - ++++++ ipv6_disabled.patch ++++++ --- /var/tmp/diff_new_pack.IWTByh/_old 2014-06-26 08:00:39.000000000 +0200 +++ /var/tmp/diff_new_pack.IWTByh/_new 2014-06-26 08:00:39.000000000 +0200 @@ -1,5 +1,7 @@ ---- src/util/inet_proto.c.orig 2012-01-03 01:57:59.000000000 +0100 -+++ src/util/inet_proto.c 2012-11-15 13:39:22.000000000 +0100 +Index: src/util/inet_proto.c +=================================================================== +--- src/util/inet_proto.c.orig ++++ src/util/inet_proto.c @@ -195,7 +195,6 @@ INET_PROTO_INFO *inet_proto_init(const c if ((sock = socket(PF_INET6, SOCK_STREAM, 0)) >= 0) { close(sock); ++++++ postfix-SuSE.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-SuSE/config.postfix new/postfix-SuSE/config.postfix --- old/postfix-SuSE/config.postfix 2014-02-12 16:09:42.000000000 +0100 +++ new/postfix-SuSE/config.postfix 2014-06-23 17:17:27.000000000 +0200 @@ -256,7 +256,7 @@ warn_user "Can't create temp directory, exiting..." exit 1 fi - cp -f /etc/postfix/main.cf $TMPDIR/main.cf + cp -f /etc/postfix/{main,master}.cf $TMPDIR # Some default settings, that seem to be useable, at least to me $PCONF -e "mail_spool_directory = /var/mail" @@ -808,6 +808,7 @@ export POSTFIX_CHROOT export POSTFIX_NULLCLIENT export USE_AMAVIS + export POSTFIX_SMTP_AUTH_SERVER export POSTFIX_SMTP_TLS_SERVER export POSTFIX_SMTP_TLS_SERVER_LEGACY_SUPPORT export POSTFIX_SMTP_TLS_CLIENT @@ -831,6 +832,8 @@ defined $ENV{POSTFIX_SMTP_TLS_SERVER_LEGACY_SUPPORT} ? $ENV{POSTFIX_SMTP_TLS_SERVER_LEGACY_SUPPORT} : "no"; my $tlsclient = defined $ENV{POSTFIX_SMTP_TLS_CLIENT} ? $ENV{POSTFIX_SMTP_TLS_CLIENT} : "no"; +my $authserver = + defined $ENV{POSTFIX_SMTP_AUTH_SERVER} ? $ENV{POSTFIX_SMTP_AUTH_SERVER} : "no"; my $normalize = {}; @@ -840,13 +843,14 @@ $use_amavis = lc($use_amavis); $tlsserver = lc($tlsserver); $tlsclient = lc($tlsclient); +$authserver = lc($authserver); open(MCF,"<$mcf") || die "unable to open $mcf: $!"; while( <MCF> ) { chomp; - if( /\#?\s*(smtp\s+inet.*?smtpd)/ ) { + if( /^\#?\s*(smtp\s+inet.*?smtpd)/ ) { if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; } if ($nullclient eq "yes") { $line = "#".$1; @@ -860,57 +864,143 @@ $line =~ /(\#?\s*smtp\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/; $line = $1."-".$2; } - } elsif( /\#?\s*(amavis\s+unix.*)/ ) { + ## amavis + } elsif( /^\#?\s*(amavis\s+unix.*)/ ) { if ($use_amavis ne "yes") { $line = "#".$1; } else { $line = $1; } - } elsif ( /\#?\s\s(-o\s+smtp_data_done_timeout=.*)/ ) { + } elsif ( /^\#?\s\s(-o\s+smtp_data_done_timeout=.*)/ ) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } - } elsif ( /\#?\s\s(-o\s+smtp_send_xforward_command=.*)/ ) { + } elsif ( /^\#?\s\s(-o\s+smtp_send_xforward_command=.*)/ ) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } - } elsif ( /\#?\s\s(-o\s+disable_dns_lookups=.*)/ ) { + } elsif ( /^\#?\s\s(-o\s+disable_dns_lookups=.*)/ ) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } - } elsif ( /\#?\s\s(-o\s+max_use=.*)/ ) { + } elsif ( /^\#?\s\s(-o\s+max_use=.*)/ ) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } - } elsif( /\#?\s*(local\s+unix.*)/ ) { + ## end amavis + } elsif( /^\#?\s*(local\s+unix.*)/ ) { if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; } if ($nullclient eq "yes") { $line = "#".$1; } else { $line = $1; } - } elsif( /\#?\s*(localhost:10025\s+inet.*)/ ) { + ## submission + } elsif( /^\#?\s*(submission\s+inet.*?smtpd)/ ) { + if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; } + if ( $tlsserver ne "yes" ) { + $line = "#".$1; + } else { + $line = $1; + } + if ( $use_amavis eq "yes" ) { + $line =~ /(^\#?\s*submission\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/; + $line = $1."10".$2; + } else { + $line =~ /(^\#?\s*submission\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/; + $line = $1."-".$2; + } + } elsif( /^\#?\s{3}(-o\s+syslog_name=.*)/ ) { + if ( $tlsserver ne "yes" ) { + $line = "# ".$1; + } else { + $line = " ".$1; + } + } elsif( /^\#?\s{3}(-o\s+smtpd_tls_security_level=.*)/ ) { + if ( $tlsserver ne "yes" ) { + $line = "# ".$1; + } else { + $line = " ".$1; + } + } elsif( /^\#?\s{3}(-o\s+smtpd_sasl_auth_enable=.*)/ ) { + if ( $tlsserver ne "yes" && $authserver ne "yes") { + $line = "# ".$1; + } else { + $line = " ".$1; + } + ## end submission + ## smtps + } elsif( /^\#?\s*(smtps\s+inet.*?smtpd)/ ) { + if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; } + if ( $sslserver ne "yes" ) { + $line = "#".$1; + } else { + $line = $1; + } + if ( $use_amavis eq "yes" ) { + $line =~ /(^\#?\s*smtps\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/; + $line = $1."10".$2; + } else { + $line =~ /(^\#?\s*smtps\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/; + $line = $1."-".$2; + } + } elsif( /^\#?\s{4}(-o\s+syslog_name=.*)/ ) { + if ( $sslserver ne "yes" ) { + $line = "# ".$1; + } else { + $line = " ".$1; + } + } elsif( /^\#?\s{4}(-o\s+smtpd_tls_wrappermode=.*)/ ) { + if ( $sslserver ne "yes" ) { + $line = "# ".$1; + } else { + $line = " ".$1; + } + } elsif( /^\#?\s{4}(-o\s+content_filter=.*)/ ) { + if ( $sslserver ne "yes" && $use_amavis ne "yes" ) { + $line = "# ".$1; + } else { + $line = " ".$1; + } + } elsif( /^\#?\s{4}(-o\s+smtpd_sasl_auth_enable=.*)/ ) { + if ( $sslserver ne "yes" && $authserver ne "yes") { + $line = "# ".$1; + } else { + $line = " ".$1; + } + ## end smtps + ## tlsmgr + } elsif( /^\#?\s*(tlsmgr\s+unix.*)/ ) { + if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; } + if ( $tlsclient ne "yes" && $tlsserver ne "yes" && $sslserver ne "yes" ) { + $line = "#".$1; + } else { + $line = $1; + } + ## end tlsmgr + ## localhost_10025 + } elsif( /^\#?\s*(localhost:10025\s+inet.*)/ ) { if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; } if ( $use_amavis ne "yes" ) { $line = "#".$1; } else { $line = $1; } - } elsif ( /\#?\s\s(-o\s+content_filter=.*)/ ) { + } elsif ( /^\#?\s\s(-o\s+content_filter=.*)/ ) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } - } elsif ( /\#?\s\s(-o\s+smtpd_delay_reject=.*)/) { + } elsif ( /^\#?\s\s(-o\s+smtpd_delay_reject=.*)/) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { @@ -928,79 +1018,79 @@ $line = " ".$1.$2; } } - } elsif ( /\#?\s\s(-o\s+smtpd_helo_restrictions=.*)/) { + } elsif ( /^\#?\s\s(-o\s+smtpd_helo_restrictions=.*)/) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } - } elsif ( /\#?\s\s(-o\s+smtpd_sender_restrictions=.*)/) { + } elsif ( /^\#?\s\s(-o\s+smtpd_sender_restrictions=.*)/) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } - } elsif ( /\#?\s\s(-o\s+smtpd_recipient_restrictions=.*)/) { + } elsif ( /^\#?\s\s(-o\s+smtpd_recipient_restrictions=.*)/) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } - } elsif ( /\#?\s\s(-o\s+smtpd_data_restrictions=.*)/) { + } elsif ( /^\#?\s\s(-o\s+smtpd_data_restrictions=.*)/) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } - } elsif ( /\#?\s\s(-o\s+smtpd_end_of_data_restrictions=.*)/) { + } elsif ( /^\#?\s\s(-o\s+smtpd_end_of_data_restrictions=.*)/) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } - } elsif ( /\#?\s\s(-o\s+smtpd_restriction_classes=.*)/) { + } elsif ( /^\#?\s\s(-o\s+smtpd_restriction_classes=.*)/) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } - } elsif ( /\#?\s\s(-o\s+mynetworks=.*)/) { + } elsif ( /^\#?\s\s(-o\s+mynetworks=.*)/) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } - } elsif ( /\#?\s\s(-o\s+smtpd_error_sleep_time=.*)/) { + } elsif ( /^\#?\s\s(-o\s+smtpd_error_sleep_time=.*)/) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } - } elsif ( /\#?\s\s(-o\s+smtpd_soft_error_limit=.*)/) { + } elsif ( /^\#?\s\s(-o\s+smtpd_soft_error_limit=.*)/) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } - } elsif ( /\#?\s\s(-o\s+smtpd_hard_error_limit=.*)/) { + } elsif ( /^\#?\s\s(-o\s+smtpd_hard_error_limit=.*)/) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } - } elsif ( /\#?\s\s(-o\s+smtpd_client_connection_count_limit=.*)/) { + } elsif ( /^\#?\s\s(-o\s+smtpd_client_connection_count_limit=.*)/) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } - } elsif ( /\#?\s\s(-o\s+smtpd_client_connection_rate_limit=.*)/) { + } elsif ( /^\#?\s\s(-o\s+smtpd_client_connection_rate_limit=.*)/) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } - } elsif ( /\#?\s\s(-o\s+receive_override_options=.*)/) { + } elsif ( /^\#?\s\s(-o\s+receive_override_options=.*)/) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { @@ -1010,45 +1100,25 @@ $line = " -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks,no_address_mappings"; } } - } elsif ( /\#?\s\s(-o\s+local_header_rewrite_clients=.*)/) { + } elsif ( /^\#?\s\s(-o\s+local_header_rewrite_clients=.*)/) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } - } elsif ( /\#?\s\s(-o\s+local_recipient_maps=.*)/) { + } elsif ( /^\#?\s\s(-o\s+local_recipient_maps=.*)/) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } - } elsif ( /\#?\s\s(-o\s+relay_recipient_maps=.*)/) { + } elsif ( /^\#?\s\s(-o\s+relay_recipient_maps=.*)/) { if ( $use_amavis ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } - } elsif( /\#?\s*(tlsmgr\s+unix.*)/ ) { - if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; } - if ( $tlsclient ne "yes" && $tlsserver ne "yes" && $sslserver ne "yes" ) { - $line = "#".$1; - } else { - $line = $1; - } - } elsif( /\#?\s*(smtps\s+inet.*?smtpd)/ ) { - if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; } - if ( $sslserver ne "yes" ) { - $line = "#".$1." -o smtpd_tls_wrappermode=yes"; - } else { - $line = $1." -o smtpd_tls_wrappermode=yes"; - } - if ( $use_amavis eq "yes" ) { - $line =~ /(\#?\s*smtps\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/; - $line = $1."10".$2." -o content_filter=smtp:[127.0.0.1]:10024"; - } else { - $line =~ /(\#?\s*smtps\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/; - $line = $1."-".$2; - } + ## end localhost_10025 } elsif( /^(\#?\s*(?:pickup|qmgr)\s+)(?:fifo|unix)(\s+.*)/ ) { if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; } if ( $laptop eq "yes" ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-SuSE/postfix.service new/postfix-SuSE/postfix.service --- old/postfix-SuSE/postfix.service 2013-10-03 04:44:47.000000000 +0200 +++ new/postfix-SuSE/postfix.service 2014-06-10 15:44:27.000000000 +0200 @@ -14,8 +14,8 @@ [Unit] Description=Postfix Mail Transport Agent -Requires=var-run.mount nss-lookup.target network.target remote-fs.target time-sync.target -After=var-run.mount nss-lookup.target network.target remote-fs.target time-sync.target +Requires=var-run.mount nss-lookup.target network.target local-fs.target time-sync.target +After=var-run.mount nss-lookup.target network.target local-fs.target time-sync.target After=amavis.service mysql.service cyrus.service ldap.service openslp.service ypbind.service Conflicts=sendmail.service exim.service ++++++ postfix-db6.diff ++++++ --- /var/tmp/diff_new_pack.IWTByh/_old 2014-06-26 08:00:39.000000000 +0200 +++ /var/tmp/diff_new_pack.IWTByh/_new 2014-06-26 08:00:39.000000000 +0200 @@ -8,10 +8,10 @@ src/util/dict_db.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: postfix-2.9.6/src/util/dict_db.c +Index: src/util/dict_db.c =================================================================== ---- postfix-2.9.6.orig/src/util/dict_db.c -+++ postfix-2.9.6/src/util/dict_db.c +--- src/util/dict_db.c.orig ++++ src/util/dict_db.c @@ -699,7 +699,7 @@ static DICT *dict_db_open(const char *cl if ((errno = db->upgrade(db,db_path,0)) != 0) msg_fatal("upgrade of database %s: %m",db_path); ++++++ postfix-master.cf.patch ++++++ --- /var/tmp/diff_new_pack.IWTByh/_old 2014-06-26 08:00:39.000000000 +0200 +++ /var/tmp/diff_new_pack.IWTByh/_new 2014-06-26 08:00:39.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- conf/master.cf.orig +++ conf/master.cf -@@ -9,6 +9,11 @@ +@@ -10,32 +10,38 @@ # (yes) (yes) (yes) (never) (100) # ========================================================================== smtp inet n - n - - smtpd @@ -14,7 +14,54 @@ #smtp inet n - n - 1 postscreen #smtpd pass - - n - - smtpd #dnsblog unix - - n - 0 dnsblog -@@ -50,6 +55,26 @@ local unix - n n + #tlsproxy unix - - n - 0 tlsproxy + #submission inet n - n - - smtpd +-# -o syslog_name=postfix/submission +-# -o smtpd_tls_security_level=encrypt +-# -o smtpd_sasl_auth_enable=yes +-# -o smtpd_reject_unlisted_recipient=no +-# -o smtpd_client_restrictions=$mua_client_restrictions +-# -o smtpd_helo_restrictions=$mua_helo_restrictions +-# -o smtpd_sender_restrictions=$mua_sender_restrictions +-# -o smtpd_recipient_restrictions= +-# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject +-# -o milter_macro_daemon_name=ORIGINATING ++# -o syslog_name=postfix/submission ++# -o smtpd_tls_security_level=encrypt ++# -o smtpd_sasl_auth_enable=yes ++# -o smtpd_reject_unlisted_recipient=no ++# -o smtpd_client_restrictions=$mua_client_restrictions ++# -o smtpd_helo_restrictions=$mua_helo_restrictions ++# -o smtpd_sender_restrictions=$mua_sender_restrictions ++# -o smtpd_recipient_restrictions= ++# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject ++# -o milter_macro_daemon_name=ORIGINATING + #smtps inet n - n - - smtpd +-# -o syslog_name=postfix/smtps +-# -o smtpd_tls_wrappermode=yes +-# -o smtpd_sasl_auth_enable=yes +-# -o smtpd_reject_unlisted_recipient=no +-# -o smtpd_client_restrictions=$mua_client_restrictions +-# -o smtpd_helo_restrictions=$mua_helo_restrictions +-# -o smtpd_sender_restrictions=$mua_sender_restrictions +-# -o smtpd_recipient_restrictions= +-# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject +-# -o milter_macro_daemon_name=ORIGINATING ++# -o syslog_name=postfix/smtps ++# -o smtpd_tls_wrappermode=yes ++# -o content_filter=smtp:[127.0.0.1]:10024 ++# -o smtpd_sasl_auth_enable=yes ++# -o smtpd_reject_unlisted_recipient=no ++# -o smtpd_client_restrictions=$mua_client_restrictions ++# -o smtpd_helo_restrictions=$mua_helo_restrictions ++# -o smtpd_sender_restrictions=$mua_sender_restrictions ++# -o smtpd_recipient_restrictions= ++# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject ++# -o milter_macro_daemon_name=ORIGINATING + #628 inet n - n - - qmqpd + pickup unix n - n 60 1 pickup + cleanup unix n - n - 0 cleanup +@@ -61,6 +67,26 @@ local unix - n n virtual unix - n n - - virtual lmtp unix - - n - - lmtp anvil unix - - n - 1 anvil @@ -41,7 +88,7 @@ scache unix - - n - 1 scache # # ==================================================================== -@@ -84,7 +109,7 @@ scache unix - - n +@@ -95,7 +121,7 @@ scache unix - - n # Also specify in main.cf: cyrus_destination_recipient_limit=1 # #cyrus unix - n n - - pipe @@ -50,7 +97,7 @@ # # ==================================================================== # -@@ -117,3 +142,7 @@ scache unix - - n +@@ -128,3 +154,7 @@ scache unix - - n #mailman unix - n n - - pipe # flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py # ${nexthop} ${user} ++++++ postfix-mysql.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-mysql/postfix-mysql.sql new/postfix-mysql/postfix-mysql.sql --- old/postfix-mysql/postfix-mysql.sql 2006-05-05 23:39:44.000000000 +0200 +++ new/postfix-mysql/postfix-mysql.sql 2014-06-23 23:37:56.000000000 +0200 @@ -17,7 +17,7 @@ active tinyint(1) NOT NULL default '1', PRIMARY KEY (username), KEY username (username) -) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Admins'; +) ENGINE=MyISAM COMMENT='Postfix Admin - Virtual Admins'; -- -- Dumping data for table `admin` @@ -42,7 +42,7 @@ modified datetime NOT NULL default '0000-00-00 00:00:00', active tinyint(1) NOT NULL default '1', PRIMARY KEY (address) -) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Aliases'; +) ENGINE=MyISAM COMMENT='Postfix Admin - Virtual Aliases'; -- -- Dumping data for table `alias` @@ -71,7 +71,7 @@ modified datetime NOT NULL default '0000-00-00 00:00:00', active tinyint(1) NOT NULL default '1', PRIMARY KEY (domain) -) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Domains'; +) ENGINE=MyISAM COMMENT='Postfix Admin - Virtual Domains'; -- -- Dumping data for table `domain` @@ -94,7 +94,7 @@ created datetime NOT NULL default '0000-00-00 00:00:00', active tinyint(1) NOT NULL default '1', KEY username (username) -) TYPE=MyISAM COMMENT='Postfix Admin - Domain Admins'; +) ENGINE=MyISAM COMMENT='Postfix Admin - Domain Admins'; -- -- Dumping data for table `domain_admins` @@ -118,7 +118,7 @@ action varchar(255) NOT NULL default '', data varchar(255) NOT NULL default '', KEY timestamp (timestamp) -) TYPE=MyISAM COMMENT='Postfix Admin - Log'; +) ENGINE=MyISAM COMMENT='Postfix Admin - Log'; -- -- Dumping data for table `log` @@ -146,7 +146,7 @@ modified datetime NOT NULL default '0000-00-00 00:00:00', active tinyint(1) NOT NULL default '1', PRIMARY KEY (username) -) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Mailboxes'; +) ENGINE=MyISAM COMMENT='Postfix Admin - Virtual Mailboxes'; -- -- Dumping data for table `mailbox` @@ -173,7 +173,7 @@ active tinyint(1) NOT NULL default '1', PRIMARY KEY (email), KEY email (email) -) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Vacation'; +) ENGINE=MyISAM COMMENT='Postfix Admin - Virtual Vacation'; -- -- Dumping data for table `vacation` ++++++ postfix-opensslconfig.patch ++++++ --- /var/tmp/diff_new_pack.IWTByh/_old 2014-06-26 08:00:39.000000000 +0200 +++ /var/tmp/diff_new_pack.IWTByh/_new 2014-06-26 08:00:39.000000000 +0200 @@ -1,6 +1,8 @@ ---- postfix-2.9.6.orig/src/tls/tls_server.c -+++ postfix-2.9.6/src/tls/tls_server.c -@@ -317,6 +317,7 @@ TLS_APPL_STATE *tls_server_init(const TL +Index: src/tls/tls_server.c +=================================================================== +--- src/tls/tls_server.c.orig ++++ src/tls/tls_server.c +@@ -364,6 +364,7 @@ TLS_APPL_STATE *tls_server_init(const TL */ SSL_load_error_strings(); OpenSSL_add_ssl_algorithms(); @@ -8,9 +10,11 @@ /* * First validate the protocols. If these are invalid, we can't continue. ---- postfix-2.9.6.orig/src/tls/tls_client.c -+++ postfix-2.9.6/src/tls/tls_client.c -@@ -323,6 +323,7 @@ TLS_APPL_STATE *tls_client_init(const TL +Index: src/tls/tls_client.c +=================================================================== +--- src/tls/tls_client.c.orig ++++ src/tls/tls_client.c +@@ -307,6 +307,7 @@ TLS_APPL_STATE *tls_client_init(const TL */ SSL_load_error_strings(); OpenSSL_add_ssl_algorithms(); ++++++ postfix-post-install.patch ++++++ --- /var/tmp/diff_new_pack.IWTByh/_old 2014-06-26 08:00:39.000000000 +0200 +++ /var/tmp/diff_new_pack.IWTByh/_new 2014-06-26 08:00:39.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- conf/post-install.orig +++ conf/post-install -@@ -696,7 +696,7 @@ EOF +@@ -708,7 +708,7 @@ EOF # Postfix 2.2. # Add missing tlsmgr service to master.cf. ++++++ postfix-ssl-release-buffers.patch ++++++ --- /var/tmp/diff_new_pack.IWTByh/_old 2014-06-26 08:00:39.000000000 +0200 +++ /var/tmp/diff_new_pack.IWTByh/_new 2014-06-26 08:00:39.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- src/tls/tls_client.c.orig +++ src/tls/tls_client.c -@@ -382,6 +382,12 @@ TLS_APPL_STATE *tls_client_init(const TL +@@ -356,6 +356,12 @@ TLS_APPL_STATE *tls_client_init(const TL return (0); } @@ -19,7 +19,7 @@ =================================================================== --- src/tls/tls_server.c.orig +++ src/tls/tls_server.c -@@ -389,6 +389,11 @@ TLS_APPL_STATE *tls_server_init(const TL +@@ -426,6 +426,11 @@ TLS_APPL_STATE *tls_server_init(const TL return (0); } ++++++ postfix-vda-v11-2.9.6.patch -> postfix-vda-v13-2.10.0.patch ++++++ --- /work/SRC/openSUSE:Factory/postfix/postfix-vda-v11-2.9.6.patch 2013-06-18 10:21:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.postfix.new/postfix-vda-v13-2.10.0.patch 2014-06-26 08:00:36.000000000 +0200 @@ -1,6 +1,6 @@ -diff -uNr postfix-2.9.6.orig/README_FILES/VDA_README postfix-2.9.6/README_FILES/VDA_README ---- postfix-2.9.6.orig/README_FILES/VDA_README 1970-01-01 01:00:00.000000000 +0100 -+++ postfix-2.9.6/README_FILES/VDA_README 2012-03-02 08:30:12.079537052 +0100 +diff -uNr postfix-2.10.0.orig/README_FILES/VDA_README postfix-2.10.0/README_FILES/VDA_README +--- postfix-2.10.0.orig/README_FILES/VDA_README 1970-01-01 01:00:00.000000000 +0100 ++++ postfix-2.10.0/README_FILES/VDA_README 2013-06-07 13:21:22.837143270 +0200 @@ -0,0 +1,10 @@ +Postfix VDA patch for maildir++ quota support by + Anderson Nadal <andernadal(a)gmail.com> @@ -12,10 +12,10 @@ +provided by this patch. + + -diff -uNr postfix-2.9.6.orig/src/global/mail_params.h postfix-2.9.6/src/global/mail_params.h ---- postfix-2.9.6.orig/src/global/mail_params.h 2012-01-15 01:36:37.000000000 +0100 -+++ postfix-2.9.6/src/global/mail_params.h 2012-03-02 08:30:12.079537052 +0100 -@@ -2360,6 +2360,54 @@ +diff -uNr postfix-2.10.0.orig/src/global/mail_params.h postfix-2.10.0/src/global/mail_params.h +--- postfix-2.10.0.orig/src/global/mail_params.h 2013-02-03 19:22:21.000000000 +0100 ++++ postfix-2.10.0/src/global/mail_params.h 2013-06-07 13:21:22.838143270 +0200 +@@ -2367,6 +2367,54 @@ #define DEF_VIRT_GID_MAPS "" extern char *var_virt_gid_maps; @@ -70,9 +70,9 @@ #define VAR_VIRT_MINUID "virtual_minimum_uid" #define DEF_VIRT_MINUID 100 extern int var_virt_minimum_uid; -diff -uNr postfix-2.9.6.orig/src/util/file_limit.c postfix-2.9.6/src/util/file_limit.c ---- postfix-2.9.6.orig/src/util/file_limit.c 2003-10-22 20:48:36.000000000 +0200 -+++ postfix-2.9.6/src/util/file_limit.c 2012-03-02 08:30:12.110537033 +0100 +diff -uNr postfix-2.10.0.orig/src/util/file_limit.c postfix-2.10.0/src/util/file_limit.c +--- postfix-2.10.0.orig/src/util/file_limit.c 2003-10-22 20:48:36.000000000 +0200 ++++ postfix-2.10.0/src/util/file_limit.c 2013-06-07 13:21:22.839143270 +0200 @@ -85,7 +85,11 @@ #else struct rlimit rlim; @@ -86,10 +86,18 @@ if (setrlimit(RLIMIT_FSIZE, &rlim) < 0) msg_fatal("setrlimit: %m"); #ifdef SIGXFSZ -diff -uNr postfix-2.9.6.orig/src/virtual/mailbox.c postfix-2.9.6/src/virtual/mailbox.c ---- postfix-2.9.6.orig/src/virtual/mailbox.c 2011-12-24 03:13:32.000000000 +0100 -+++ postfix-2.9.6/src/virtual/mailbox.c 2012-03-02 08:30:12.110537033 +0100 -@@ -70,6 +70,70 @@ +diff -uNr postfix-2.10.0.orig/src/virtual/mailbox.c postfix-2.10.0/src/virtual/mailbox.c +--- postfix-2.10.0.orig/src/virtual/mailbox.c 2011-12-24 03:13:32.000000000 +0100 ++++ postfix-2.10.0/src/virtual/mailbox.c 2013-06-07 13:23:03.044139705 +0200 +@@ -52,6 +52,7 @@ + #include <mymalloc.h> + #include <stringops.h> + #include <set_eugid.h> ++#include <iostuff.h> + + /* Global library. */ + +@@ -70,6 +71,70 @@ #define YES 1 #define NO 0 @@ -160,6 +168,23 @@ /* deliver_mailbox_file - deliver to recipient mailbox */ static int deliver_mailbox_file(LOCAL_STATE state, USER_ATTR usr_attr) +@@ -80,7 +145,6 @@ + int mail_copy_status; + int deliver_status; + int copy_flags; +- long end; + struct stat st; + + /* +@@ -132,7 +196,7 @@ + msg_warn("specify \"%s = no\" to ignore mailbox ownership mismatch", + VAR_STRICT_MBOX_OWNER); + } else { +- end = vstream_fseek(mp->fp, (off_t) 0, SEEK_END); ++ vstream_fseek(mp->fp, (off_t) 0, SEEK_END); + mail_copy_status = mail_copy(COPY_ATTR(state.msg_attr), mp->fp, + copy_flags, "\n", why); + } @@ -213,62 +277,72 @@ * Look up the mailbox owner rights. Defer in case of trouble. */ @@ -268,9 +293,9 @@ /* * Cleanup. -diff -uNr postfix-2.9.6.orig/src/virtual/maildir.c postfix-2.9.6/src/virtual/maildir.c ---- postfix-2.9.6.orig/src/virtual/maildir.c 2012-01-25 01:41:08.000000000 +0100 -+++ postfix-2.9.6/src/virtual/maildir.c 2012-03-02 08:33:47.724529361 +0100 +diff -uNr postfix-2.10.0.orig/src/virtual/maildir.c postfix-2.10.0/src/virtual/maildir.c +--- postfix-2.10.0.orig/src/virtual/maildir.c 2012-01-25 01:41:08.000000000 +0100 ++++ postfix-2.10.0/src/virtual/maildir.c 2013-06-07 13:21:22.840143270 +0200 @@ -64,28 +64,420 @@ #include <mbox_open.h> #include <dsn_util.h> @@ -1210,19 +1235,19 @@ + if (*var_virt_maildir_limit_message_maps != 0 && (limit_message = mail_addr_find(virtual_maildir_limit_message_maps, state.msg_attr.user, (char **) NULL)) != 0) { + errno = errnored; + if (errno == EFBIG) { -+ dsb_simple(why, "5.2.2", limit_message); ++ dsb_simple(why, "5.2.2", limit_message, NULL); + } + if (errno == EDQUOT) { -+ dsb_simple(why, "4.2.2", limit_message); ++ dsb_simple(why, "4.2.2", limit_message, NULL); + } + } + else { + errno = errnored; + if (errno == EFBIG) { -+ dsb_simple(why, "5.2.2", var_virt_maildir_limit_message); ++ dsb_simple(why, "5.2.2", var_virt_maildir_limit_message, NULL); + } + if (errno == EDQUOT) { -+ dsb_simple(why, "4.2.2", var_virt_maildir_limit_message); ++ dsb_simple(why, "4.2.2", var_virt_maildir_limit_message, NULL); + } + } + @@ -1256,9 +1281,9 @@ + return (deliver_status); } -diff -uNr postfix-2.9.6.orig/src/virtual/virtual.c postfix-2.9.6/src/virtual/virtual.c ---- postfix-2.9.6.orig/src/virtual/virtual.c 2011-02-19 01:46:06.000000000 +0100 -+++ postfix-2.9.6/src/virtual/virtual.c 2012-03-02 08:30:12.111537033 +0100 +diff -uNr postfix-2.10.0.orig/src/virtual/virtual.c postfix-2.10.0/src/virtual/virtual.c +--- postfix-2.10.0.orig/src/virtual/virtual.c 2011-02-19 01:46:06.000000000 +0100 ++++ postfix-2.10.0/src/virtual/virtual.c 2013-06-07 13:21:22.840143270 +0200 @@ -335,12 +335,30 @@ char *var_mail_spool_dir; /* XXX dependency fix */ bool var_strict_mbox_owner; @@ -1353,9 +1378,9 @@ MAIL_SERVER_PRIVILEGED, 0); } -diff -uNr postfix-2.9.6.orig/src/virtual/virtual.h postfix-2.9.6/src/virtual/virtual.h ---- postfix-2.9.6.orig/src/virtual/virtual.h 2006-01-08 00:59:47.000000000 +0100 -+++ postfix-2.9.6/src/virtual/virtual.h 2012-03-02 08:30:12.111537033 +0100 +diff -uNr postfix-2.10.0.orig/src/virtual/virtual.h postfix-2.10.0/src/virtual/virtual.h +--- postfix-2.10.0.orig/src/virtual/virtual.h 2006-01-08 00:59:47.000000000 +0100 ++++ postfix-2.10.0/src/virtual/virtual.h 2013-06-07 13:21:22.841143270 +0200 @@ -34,6 +34,9 @@ extern MAPS *virtual_mailbox_maps; extern MAPS *virtual_uid_maps; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit apache-commons-codec for openSUSE:Factory
by root＠hilbert.suse.de 26 Jun '14

26 Jun '14

Hello community, here is the log from the commit of package apache-commons-codec for openSUSE:Factory checked in at 2014-06-26 08:00:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-commons-codec (Old) and /work/SRC/openSUSE:Factory/.apache-commons-codec.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache-commons-codec" Changes: -------- --- /work/SRC/openSUSE:Factory/apache-commons-codec/apache-commons-codec.changes 2014-05-17 06:43:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apache-commons-codec.new/apache-commons-codec.changes 2014-06-26 08:00:34.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Jun 22 17:18:33 UTC 2014 - schwab(a)suse.de + +- timeout.patch: avoid spurious timeout in BeiderMorse tests + +------------------------------------------------------------------- New: ---- timeout.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-commons-codec.spec ++++++ --- /var/tmp/diff_new_pack.rbtLbo/_old 2014-06-26 08:00:36.000000000 +0200 +++ /var/tmp/diff_new_pack.rbtLbo/_new 2014-06-26 08:00:36.000000000 +0200 @@ -36,6 +36,9 @@ Source2: apache-commons-codec.keyring Source4: MANIFEST.MF +# PATCH-FIX-OPENSUSE Avoid spurious timeout in BeiderMorse tests +Patch0: timeout.patch + BuildRequires: ant >= 1.7 BuildRequires: ant-junit >= 1.7 BuildRequires: java-devel >= 1.6.0 @@ -90,6 +93,7 @@ %prep %gpg_verify %{SOURCE1} %setup -q -n %{short_name}-%{version}-src +%patch0 -p1 #fixes eof encoding sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt ++++++ timeout.patch ++++++ Index: commons-codec-1.8-src/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java =================================================================== --- commons-codec-1.8-src.orig/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java +++ commons-codec-1.8-src/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java @@ -125,7 +125,7 @@ public class BeiderMorseEncoderTest exte Languages.getInstance("thereIsNoSuchLanguage"); } - @Test(timeout = 10000L) + @Test public void testLongestEnglishSurname() throws EncoderException { final BeiderMorseEncoder bmpm = createGenericApproxEncoder(); bmpm.encode("MacGhilleseatheanaich"); Index: commons-codec-1.8-src/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java =================================================================== --- commons-codec-1.8-src.orig/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java +++ commons-codec-1.8-src/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java @@ -71,7 +71,7 @@ public class PhoneticEngineTest { this.maxPhonemes = maxPhonemes; } - @Test(timeout = 10000L) + @Test public void testEncode() { final PhoneticEngine engine = new PhoneticEngine(this.nameType, this.ruleType, this.concat, this.maxPhonemes); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit os-prober for openSUSE:Factory
by root＠hilbert.suse.de 26 Jun '14

26 Jun '14

Hello community, here is the log from the commit of package os-prober for openSUSE:Factory checked in at 2014-06-26 08:00:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-prober (Old) and /work/SRC/openSUSE:Factory/.os-prober.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "os-prober" Changes: -------- --- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2014-06-19 13:08:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2014-06-26 08:00:33.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 20 20:42:01 UTC 2014 - jeffm(a)suse.com + +- add os-prober-call-dmraid-once.patch + * fix os-prober: dmraid is called without a device list for every + partition (bnc#883453) + +------------------------------------------------------------------- New: ---- os-prober-call-dmraid-once.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-prober.spec ++++++ --- /var/tmp/diff_new_pack.XlqsN5/_old 2014-06-26 08:00:34.000000000 +0200 +++ /var/tmp/diff_new_pack.XlqsN5/_new 2014-06-26 08:00:34.000000000 +0200 @@ -53,6 +53,8 @@ Patch13: os-prober-fix-btrfs-subvol-mounted-tests.patch # PATCH-FIX-SLE: fix os-prober creates many unusuable entries on multipath disk (bnc#875327) Patch14: os-prober-skip-part-on-multipath.patch +# PATCH-FIX-SLE: fix os-prober: dmraid is called without a device list for every partition (bnc#883453) +Patch15: os-prober-call-dmraid-once.patch Requires: /bin/grep Requires: /bin/sed @@ -85,6 +87,7 @@ %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 %build make %{?_smp_mflags} CC="%__cc" CFLAGS="%{optflags}" ++++++ os-prober-call-dmraid-once.patch ++++++ From: Jeff Mahoney <jeffm(a)suse.com> Subject: os-prober: call dmraid -r *once* References: bnc#883453 os-prober calls dmraid -r -c unqualifed for every partition and then greps the result. dmraid -r -c without a device list will scan every device on the system. Every time. The results will not differ between runs. This patch saves the results and performs the grep afterward. Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> --- os-prober | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- a/os-prober +++ b/os-prober @@ -14,11 +14,17 @@ log_output () { fi } +: >"$OS_PROBER_TMP/dmraid-map" +DMRAID=$(type dmraid >/dev/null 2>&1 || true) +if [ -n "$DMRAID" ]; then + dmraid -r -c >"$OS_PROBER_TMP/dmraid-map" +fi + on_sataraid () { type dmraid >/dev/null 2>&1 || return 1 local parent="${1%/*}" local device="/dev/${parent##*/}" - if dmraid -r -c | grep -q "$device"; then + if grep -q "$device" "$OS_PROBER_TMP/dmraid-map"; then return 0 fi return 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 perl-Text-BibTeX for openSUSE:Factory
by root＠hilbert.suse.de 26 Jun '14

26 Jun '14

Hello community, here is the log from the commit of package perl-Text-BibTeX for openSUSE:Factory checked in at 2014-06-26 08:00:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Text-BibTeX (Old) and /work/SRC/openSUSE:Factory/.perl-Text-BibTeX.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Text-BibTeX" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Text-BibTeX/perl-Text-BibTeX.changes 2013-03-04 17:31:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Text-BibTeX.new/perl-Text-BibTeX.changes 2014-06-26 08:00:31.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Jun 20 14:55:33 UTC 2014 - schwab(a)linux-m68k.org + +- perl-Text-BibTeX-uninit.patch: Fix use of unitialized memory +- update to 0.69 + * Replacement for islower() which understands all Unicode 6.2.0 + chars with "LOWERCASE" property + * Fixes for UTF-8 handling of combining marks + +------------------------------------------------------------------- Old: ---- Text-BibTeX-0.66.tar.gz New: ---- Text-BibTeX-0.69.tar.gz perl-Text-BibTeX-uninit.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Text-BibTeX.spec ++++++ --- /var/tmp/diff_new_pack.97axbX/_old 2014-06-26 08:00:32.000000000 +0200 +++ /var/tmp/diff_new_pack.97axbX/_new 2014-06-26 08:00:32.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Text-BibTeX -Version: 0.66 +Version: 0.69 Release: 0 %define cpan_name Text-BibTeX Summary: Interface to read and parse BibTeX files @@ -27,6 +27,7 @@ Source: http://www.cpan.org/authors/id/A/AM/AMBS/Text/%{cpan_name}-%{version}.tar.gz Patch: Text-BibTeX-rpmlint.patch Patch1: perl-Text-BibTeX-libdir.patch +Patch2: perl-Text-BibTeX-uninit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros @@ -74,6 +75,7 @@ %setup -q -n %{cpan_name}-%{version} %patch %patch1 +%patch2 -p1 find . -type f -print0 | xargs -0 chmod 644 %build @@ -91,7 +93,7 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc CHANGES README README.OLD scripts THANKS +%doc Changes README README.OLD scripts THANKS %{_libdir}/libbtparse.so %changelog ++++++ Text-BibTeX-0.66.tar.gz -> Text-BibTeX-0.69.tar.gz ++++++ ++++ 3007 lines of diff (skipped) ++++++ perl-Text-BibTeX-uninit.patch ++++++ Index: Text-BibTeX-0.69/btparse/src/format_name.c =================================================================== --- Text-BibTeX-0.69.orig/btparse/src/format_name.c +++ Text-BibTeX-0.69/btparse/src/format_name.c @@ -120,6 +120,8 @@ bt_create_name_format (char * parts, boo format = (bt_name_format *) malloc (sizeof (bt_name_format)); format->num_parts = num_parts; + for (i = 0; i < BT_MAX_NAMEPARTS; i++) + part_pos[i] = -2; for (i = 0; i < num_parts; i++) { switch (parts[i]) @@ -904,6 +906,11 @@ dump_format (bt_name_format * format) for (i = 0; i < BT_MAX_NAMEPARTS; i++) { + int j; + for (j = 0; j < format->num_parts; j++) + if (i == format->parts[j]) + break; + if (j == format->num_parts) continue; printf (" %-5s: pre-part=%p (%s), post-part=%p (%s)\n", nameparts[i], format->pre_part[i], format->pre_part[i], -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit telepathy-qt4 for openSUSE:Factory
by root＠hilbert.suse.de 26 Jun '14

26 Jun '14

Hello community, here is the log from the commit of package telepathy-qt4 for openSUSE:Factory checked in at 2014-06-26 08:00:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/telepathy-qt4 (Old) and /work/SRC/openSUSE:Factory/.telepathy-qt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "telepathy-qt4" Changes: -------- --- /work/SRC/openSUSE:Factory/telepathy-qt4/telepathy-qt4.changes 2013-11-11 14:53:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.telepathy-qt4.new/telepathy-qt4.changes 2014-06-26 08:00:27.000000000 +0200 @@ -1,0 +2,17 @@ +Thu Jun 19 20:59:18 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 0.9.4 + + Enhancements: + * fdo#63098: add method Account::createDbusTubeRoom + + Fixes: + * fdo#46241: Fixed linking in farstream and farsight + * Require tp-glib 0.18 and fix 0.19-ism + * fdo#47647: Fixed storing avatars, so that they are not stored + millions of times each. + * fdo#62711: Fixed stack overflow in SimpleObserver::create + * Fix compilation and running against release Qt5 +- Drop patches included in this release: + Fix-storing-avatars.patch + fix-compilation-on-new-versions-of-cmake.patch + +------------------------------------------------------------------- Old: ---- Fix-storing-avatars.patch fix-compilation-on-new-versions-of-cmake.patch telepathy-qt-0.9.3.tar.gz New: ---- telepathy-qt-0.9.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-qt4.spec ++++++ --- /var/tmp/diff_new_pack.pmhEhe/_old 2014-06-26 08:00:28.000000000 +0200 +++ /var/tmp/diff_new_pack.pmhEhe/_new 2014-06-26 08:00:28.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package telepathy-qt4 # -# 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 @@ -26,7 +26,7 @@ %define gstreamer1 0 Name: telepathy-qt4 -Version: 0.9.3 +Version: 0.9.4 Release: 0 Summary: Qt4 bindings for the Telepathy Library License: LGPL-2.1+ @@ -39,10 +39,6 @@ Patch1: search-for-gstreamer1.0.diff # PATCH-FIX-UPSTREAM search-for-telepathy-farstream-0.4.diff -- searches for telepathy-farstream-0.4 Patch2: search-for-telepathy-farstream-0.4.diff -# PATCH-FIX-UPSTREAM Fix-storing-avatars.patch -- fix storing avatars, so that they are not stored millions of times each (fdo#47647) -Patch3: Fix-storing-avatars.patch -# PATCH-FIX-UPSTREAM fix-compilation-on-new-versions-of-cmake.patch -Patch4: fix-compilation-on-new-versions-of-cmake.patch BuildRequires: cmake BuildRequires: dbus-1-python BuildRequires: doxygen @@ -123,8 +119,6 @@ %endif %endif %endif -%patch3 -p1 -%patch4 -p1 %build export CXXFLAGS="%{optflags}" ++++++ telepathy-qt-0.9.3.tar.gz -> telepathy-qt-0.9.4.tar.gz ++++++ ++++ 618660 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