commit sg3_utils for openSUSE:Factory

2019-05-06 Thread root
Hello community,

here is the log from the commit of package sg3_utils for openSUSE:Factory 
checked in at 2019-05-06 13:17:32

Comparing /work/SRC/openSUSE:Factory/sg3_utils (Old)
 and  /work/SRC/openSUSE:Factory/.sg3_utils.new.5148 (New)


Package is "sg3_utils"

Mon May  6 13:17:32 2019 rev:54 rq:699766 version:1.45~815+5.6aa67ed

Changes:

--- /work/SRC/openSUSE:Factory/sg3_utils/sg3_utils.changes  2019-04-30 
12:56:46.142196780 +0200
+++ /work/SRC/openSUSE:Factory/.sg3_utils.new.5148/sg3_utils.changes
2019-05-06 13:17:43.292010442 +0200
@@ -22,0 +23,5 @@
+Thu Apr 18 18:33:13 UTC 2019 - Jan Engelhardt 
+
+- Replace old $RPM_* shell vars.
+
+---



Other differences:
--
++ sg3_utils.spec ++
--- /var/tmp/diff_new_pack.Aum9CI/_old  2019-05-06 13:17:44.960014416 +0200
+++ /var/tmp/diff_new_pack.Aum9CI/_new  2019-05-06 13:17:44.960014416 +0200
@@ -93,20 +93,20 @@
 
 %install
 %make_install
-install -m 644 doc/rescan-scsi-bus.sh.8 $RPM_BUILD_ROOT%{_mandir}/man8
-mkdir -p $RPM_BUILD_ROOT%{_udevrulesdir}
-install -m 644 scripts/54-before-scsi-sg3_id.rules 
$RPM_BUILD_ROOT%{_udevrulesdir}
-install -m 644 scripts/55-scsi-sg3_id.rules $RPM_BUILD_ROOT%{_udevrulesdir}
-install -m 644 scripts/58-scsi-sg3_symlink.rules 
$RPM_BUILD_ROOT%{_udevrulesdir}
-install -m 644 scripts/40-usb-blacklist.rules $RPM_BUILD_ROOT%{_udevrulesdir}
-install -m 644 scripts/59-fc-wwpn-id.rules $RPM_BUILD_ROOT%{_udevrulesdir}
-install -m 755 scripts/fc_wwpn_id $RPM_BUILD_ROOT%{_udevrulesdir}/..
-mkdir -p $RPM_BUILD_ROOT/usr/lib/dracut/dracut.conf.d
-install -m 644 %{SOURCE1} 
$RPM_BUILD_ROOT/usr/lib/dracut/dracut.conf.d/50-sg3_utils.conf
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-install -m 644 scripts/lunmask.service $RPM_BUILD_ROOT%{_unitdir}
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}/../scripts
-install -m 755 scripts/scsi-enable-target-scan.sh 
$RPM_BUILD_ROOT%{_unitdir}/../scripts
+install -m 644 doc/rescan-scsi-bus.sh.8 %{buildroot}/%{_mandir}/man8
+mkdir -p %{buildroot}/%{_udevrulesdir}
+install -m 644 scripts/54-before-scsi-sg3_id.rules 
%{buildroot}/%{_udevrulesdir}
+install -m 644 scripts/55-scsi-sg3_id.rules %{buildroot}/%{_udevrulesdir}
+install -m 644 scripts/58-scsi-sg3_symlink.rules %{buildroot}/%{_udevrulesdir}
+install -m 644 scripts/40-usb-blacklist.rules %{buildroot}/%{_udevrulesdir}
+install -m 644 scripts/59-fc-wwpn-id.rules %{buildroot}/%{_udevrulesdir}
+install -m 755 scripts/fc_wwpn_id %{buildroot}/%{_udevrulesdir}/..
+mkdir -p %{buildroot}/usr/lib/dracut/dracut.conf.d
+install -m 644 %{SOURCE1} 
%{buildroot}/usr/lib/dracut/dracut.conf.d/50-sg3_utils.conf
+mkdir -p %{buildroot}/%{_unitdir}
+install -m 644 scripts/lunmask.service %{buildroot}/%{_unitdir}
+mkdir -p %{buildroot}/%{_unitdir}/../scripts
+install -m 755 scripts/scsi-enable-target-scan.sh 
%{buildroot}/%{_unitdir}/../scripts
 rm -f %{buildroot}%{_libdir}/*.la
 
 %post -n %lname -p /sbin/ldconfig




commit ltrace for openSUSE:Factory

2019-05-06 Thread root
Hello community,

here is the log from the commit of package ltrace for openSUSE:Factory checked 
in at 2019-05-06 13:17:12

Comparing /work/SRC/openSUSE:Factory/ltrace (Old)
 and  /work/SRC/openSUSE:Factory/.ltrace.new.5148 (New)


Package is "ltrace"

Mon May  6 13:17:12 2019 rev:41 rq:699688 version:0.7.91

Changes:

--- /work/SRC/openSUSE:Factory/ltrace/ltrace.changes2019-04-02 
09:18:23.652534565 +0200
+++ /work/SRC/openSUSE:Factory/.ltrace.new.5148/ltrace.changes  2019-05-06 
13:17:13.251938871 +0200
@@ -1,0 +2,6 @@
+Tue Apr 30 10:35:37 UTC 2019 - Martin Liška 
+
+- Add gcc9-Wlto-type-mismatch.patch in order to address LTO warnings
+  (boo#1133256).
+
+---

New:

  gcc9-Wlto-type-mismatch.patch



Other differences:
--
++ ltrace.spec ++
--- /var/tmp/diff_new_pack.WvvcIA/_old  2019-05-06 13:17:14.211941158 +0200
+++ /var/tmp/diff_new_pack.WvvcIA/_new  2019-05-06 13:17:14.255941263 +0200
@@ -48,6 +48,7 @@
 Patch4: arm-trace.patch
 Patch5: gcc9-printf-s-null-argument.patch
 Patch6: lens-double-free.patch
+Patch7: gcc9-Wlto-type-mismatch.patch
 
 %description
 Ltrace is a program that runs the specified command until it exits. It
@@ -69,6 +70,7 @@
 %patch4 -p1
 %patch5
 %patch6 -p1
+%patch7 -p1
 
 %build
 ./autogen.sh

++ gcc9-Wlto-type-mismatch.patch ++
diff --git a/filter.c b/filter.c
index ba50c40..b529c61 100644
--- a/filter.c
+++ b/filter.c
@@ -18,6 +18,8 @@
  * 02110-1301 USA
  */
 
+#include "config.h"
+
 #include 
 #include 
 #include 
diff --git a/options.h b/options.h
index 38f4ecd..dff401d 100644
--- a/options.h
+++ b/options.h
@@ -25,6 +25,8 @@
 #ifndef OPTIONS_H
 #define OPTIONS_H
 
+#include "config.h"
+
 #include 
 #include 
 #include 



commit man for openSUSE:Factory

2019-05-06 Thread root
Hello community,

here is the log from the commit of package man for openSUSE:Factory checked in 
at 2019-05-06 13:17:04

Comparing /work/SRC/openSUSE:Factory/man (Old)
 and  /work/SRC/openSUSE:Factory/.man.new.5148 (New)


Package is "man"

Mon May  6 13:17:04 2019 rev:74 rq:699626 version:2.8.4

Changes:

--- /work/SRC/openSUSE:Factory/man/man.changes  2019-03-12 09:48:20.591598719 
+0100
+++ /work/SRC/openSUSE:Factory/.man.new.5148/man.changes2019-05-06 
13:17:06.231922145 +0200
@@ -1,0 +2,13 @@
+Tue Apr 30 10:57:35 UTC 2019 - Dr. Werner Fink 
+
+- Make systemd timers and services optional but hold them enabled
+  as maybe in future all packages providing manual pages might use
+  a posttrans scriplet to trigger a refresh of the man db (boo#1133762).
+
+---
+Tue Apr 30 09:09:19 UTC 2019 - lnus...@suse.de
+
+- remove %verify(not group) from /var/cache/man, the inconsistent
+  permissions are fixed in the permissions package (boo#1133678)
+
+---



Other differences:
--
++ man.spec ++
--- /var/tmp/diff_new_pack.wG83pn/_old  2019-05-06 13:17:07.019924023 +0200
+++ /var/tmp/diff_new_pack.wG83pn/_new  2019-05-06 13:17:07.019924023 +0200
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -21,6 +21,8 @@
   %define _fillupdir /var/adm/fillup-templates
 %endif
 
+%bcond_without  sdtimer
+
 Name:   man
 BuildRequires:  automake
 BuildRequires:  flex
@@ -35,6 +37,7 @@
 BuildRequires:  man-pages
 BuildRequires:  pkg-config
 BuildRequires:  po4a
+BuildRequires:  systemd
 BuildRequires:  update-alternatives
 BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
@@ -59,6 +62,7 @@
 Requires(pre):  group(man)
 Requires(post): update-alternatives
 Requires(preun): update-alternatives
+Requires(posttrans): systemd
 Source: 
http://download.savannah.gnu.org/releases/man-db/man-db-%{version}.tar.xz
 Source1:sysconfig.cron-man
 Source2:cron.daily.do_mandb
@@ -261,30 +265,35 @@
 %else
 install -m 0744 %{SOURCE2} %{buildroot}/%{_libexecdir}/man-db/do_mandb
 %endif
+%if %{with sdtimer}
 install -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/
 %if 0%{suse_version} >= 1500
 install -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/
 install -m 0644 %{SOURCE9} %{buildroot}%{_unitdir}/
 %endif
+%endif
 
 %find_lang man-db --all-name --with-man
 
 %pre
 test -d var/catman/ && rm -rf var/catman/ || true
+%if %{with sdtimer}
 %if 0%{suse_version} >= 1500
 %service_add_pre man-db-create.service mandb.service mandb.timer
 %else
 %service_add_pre man-db-create.service
 %endif
+%endif
 
 %post
-%{?tmpfiles_create:%tmpfiles_create %{_libexecdir}/tmpfiles.d/man-db.conf}
 %{fillup_only -an cron}
 /sbin/ldconfig
+%if %{with sdtimer}
 %service_add_post man-db-create.service
 %if 0%{suse_version} >= 1500
 %service_add_post mandb.service mandb.timer
 %endif
+%endif
 # Remark: soelim(1) is part of package groff or mandoc and
 # makewhatis(8) is part of package makewaht or mandoc
 %{_sbindir}/update-alternatives --quiet --force \
@@ -296,10 +305,12 @@
--slave   %{_mandir}/man1/whatis.1%{?ext_man}  whatis.1%{?ext_man}  
%{_mandir}/man1/whatis-db.1%{?ext_man}
 
 %preun
+%if %{with sdtimer}
 %service_del_preun man-db-create.service
 %if 0%{suse_version} >= 1500
 %service_del_preun mandb.service mandb.timer
 %endif
+%endif
 if test $1 -eq 0
 then
%{_sbindir}/update-alternatives --quiet --remove man %{_bindir}/man
@@ -307,13 +318,19 @@
 
 %postun
 /sbin/ldconfig
+%if %{with sdtimer}
 %service_del_postun man-db-create.service
 %if 0%{suse_version} >= 1500
 %service_del_postun mandb.service mandb.timer
 %endif
+%endif
 
 %posttrans
-test -d /var/cache/man && mandb --quiet --create ||:
+%{?tmpfiles_create:%tmpfiles_create %{_libexecdir}/tmpfiles.d/man-db.conf}
+if test -d %{_localstatedir}/cache/man
+then
+  mandb --quiet --create || :
+fi
 
 %files -f man-db.lang
 %defattr(-,root,root)
@@ -354,11 +371,13 @@
 %dir %{_libexecdir}/tmpfiles.d
 %endif
 %{_libexecdir}/tmpfiles.d/man-db.conf
+%if %{with sdtimer}
 %{_unitdir}/man-db-create.service
 %if 0%{suse_version} >= 1500
 %{_unitdir}/mandb.service
 %{_unitdir}/mandb.timer
 %endif
+%endif
 %dir %{_datadir}/groff/site-tmac
 %{_datadir}/groff/site-tmac/tmac.andb
 %{_datadir}/groff/site-tmac/tmac.andocdb
@@ -370,6 +389,6 @@
 %dir %{_mandir}/tr
 %{_fillupdir}/sysconfig.cron-man
 %defattr(-,man,man)
-%ghost %verify(not group) 

commit multipath-tools for openSUSE:Factory

2019-05-06 Thread root
Hello community,

here is the log from the commit of package multipath-tools for openSUSE:Factory 
checked in at 2019-05-06 13:17:19

Comparing /work/SRC/openSUSE:Factory/multipath-tools (Old)
 and  /work/SRC/openSUSE:Factory/.multipath-tools.new.5148 (New)


Package is "multipath-tools"

Mon May  6 13:17:19 2019 rev:113 rq:699729 version:0.8.1+8+suse.8c11498

Changes:

--- /work/SRC/openSUSE:Factory/multipath-tools/multipath-tools.changes  
2019-04-21 09:02:11.818466807 +0200
+++ 
/work/SRC/openSUSE:Factory/.multipath-tools.new.5148/multipath-tools.changes
2019-05-06 13:17:25.135967185 +0200
@@ -1,0 +2,21 @@
+Tue Apr 30 14:48:40 UTC 2019 - mwi...@suse.com
+
+- Disable kmod() style dependencies again (bsc#1119414)
+  * For TW, dependencies will be autogenerated
+(gh#openSUSE/rpm-config-SUSE#3)
+  * For SLE, feature is currently rejected (jsc#SLE-3853)
+- Update to version 0.8.1+8+suse.8c11498:
+  * Avoid deadlock situation during udev settle
+  (bsc#1131789, bsc#1125145)
+- multipath -u: test socket connection in non-blocking mode
+  * Fix priority handling for offline paths
+  (bsc#1118495)
+- Update to upstream 0.8.1
+  * Avoid device IO in "multipath -u" (bsc#1125145)
+  * multipathd: protect all access to running_state
+  (bsc##1110060, bsc#1110439)
+  * Improve handling of changed WWIDs and temporary failure
+  to obtain WWID. Option "disable_changed_wwids" is now ignored.
+  * Fixes for PATH_PENDING state handling (bsc#1125043)
+
+---

Old:

  multipath-tools-0.8.0+17+suse.a28893f.tar.xz

New:

  multipath-tools-0.8.1+8+suse.8c11498.tar.xz



Other differences:
--
++ multipath-tools.spec ++
--- /var/tmp/diff_new_pack.Jd9hIc/_old  2019-05-06 13:17:26.511970463 +0200
+++ /var/tmp/diff_new_pack.Jd9hIc/_new  2019-05-06 13:17:26.511970463 +0200
@@ -49,7 +49,7 @@
 %define _sysdir usr/lib
 
 Name:   multipath-tools
-Version:0.8.0+17+suse.a28893f
+Version:0.8.1+8+suse.8c11498
 Release:0
 Summary:Tools to Manage Multipathed Devices with the device-mapper
 License:GPL-2.0-only
@@ -82,14 +82,6 @@
 Requires:   device-mapper >= 1.2.78
 Requires:   kpartx
 Requires:   sg3_utils
-# Generate  kmod(xyz)-style dependencies for modules that we put
-# in modules-load.d. Use the modules.d file (Source1) as input to avoid
-# maintaining these dependencies in several places.
-# This feature is to be enabled for SLE15-SP1, and some time in the
-# near future, for Factory.
-%if 0%{?sle_version} >= 150100
-%(sed 's/^\s*//;s/\s*$//;/^#/d;/^$/d;s/^/Requires: kmod(/;s/$/)/;' %{S:1})
-%endif
 Obsoletes:  multipath-tools-rbd <= %{version}
 PreReq: coreutils grep
 
@@ -107,11 +99,11 @@
 # and it loads prioritizers (to be fixed) and checkers.
 %package -n libmpath0
 Summary:Libraries for multipath-tools
+License:GPL-2.0-only AND LGPL-2.1-only AND LGPL-2.0-or-later
+Group:  System/Libraries
 # This is for libmpathcmd, which is useless without multipathd.
 # No hard dependency here - we don't want to pull in all dependencies
 # of multipath-tools.
-License:GPL-2.0-only AND LGPL-2.1-only AND LGPL-2.0-or-later
-Group:  System/Libraries
 Recommends: multipath-tools
 Conflicts:  multipath-tools < 0.8.0
 

++ _service ++
--- /var/tmp/diff_new_pack.Jd9hIc/_old  2019-05-06 13:17:26.531970511 +0200
+++ /var/tmp/diff_new_pack.Jd9hIc/_new  2019-05-06 13:17:26.531970511 +0200
@@ -8,7 +8,7 @@
are have been added to factory before upstream will be
counted. Determine patch offset manually! It should be the number
of patches which are _really_ not upstream (yet). -->
-@PARENT_TAG@+17+suse.%h
+@PARENT_TAG@+8+suse.%h
 factory
 0.[0-9].[0-9]
 enable

++ _servicedata ++
--- /var/tmp/diff_new_pack.Jd9hIc/_old  2019-05-06 13:17:26.543970540 +0200
+++ /var/tmp/diff_new_pack.Jd9hIc/_new  2019-05-06 13:17:26.543970540 +0200
@@ -1,6 +1,4 @@
 
 
 https://github.com/openSUSE/multipath-tools.git
-  a28893f67c7ca0009b9ef8b85732348b3c3092f1
-https://github.com/mwilck/multipath-tools.git
-  08a969b7fce0db769b63bdbfead2a452dc417d58
\ No newline at end of file
+  8c114985f9fd7eb142ddec9737870f99ff28d5ba
\ No newline at end of file

++ multipath-tools-0.8.0+17+suse.a28893f.tar.xz -> 
multipath-tools-0.8.1+8+suse.8c11498.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/multipath-tools-0.8.0+17+suse.a28893f/libmpathcmd/mpath_cmd.c 
new/multipath-tools-0.8.1+8+suse.8c11498/libmpathcmd/mpath_cmd.c
--- 

commit netcfg for openSUSE:Factory

2019-05-06 Thread root
Hello community,

here is the log from the commit of package netcfg for openSUSE:Factory checked 
in at 2019-05-06 13:16:55

Comparing /work/SRC/openSUSE:Factory/netcfg (Old)
 and  /work/SRC/openSUSE:Factory/.netcfg.new.5148 (New)


Package is "netcfg"

Mon May  6 13:16:55 2019 rev:44 rq:699609 version:11.6

Changes:

--- /work/SRC/openSUSE:Factory/netcfg/netcfg.changes2018-09-18 
11:41:37.412024378 +0200
+++ /work/SRC/openSUSE:Factory/.netcfg.new.5148/netcfg.changes  2019-05-06 
13:16:58.055902666 +0200
@@ -1,0 +2,8 @@
+Wed Apr 17 09:25:24 CEST 2019 - ku...@suse.de
+
+- Remove pre/post install to get rid of coreutils dependency.
+  We don't support upgrading of this old code anymore and coreutils
+  is not wanted in busybox containers.
+- Update services.bz2
+
+---



Other differences:
--
++ netcfg.spec ++
--- /var/tmp/diff_new_pack.xjs0W0/_old  2019-05-06 13:16:58.855904572 +0200
+++ /var/tmp/diff_new_pack.xjs0W0/_new  2019-05-06 13:16:58.859904582 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package netcfg
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -45,8 +45,6 @@
 Source102:  services-create.pl
 Source103:  services_UPDATING
 Patch0: services-suse.diff
-Requires(post): coreutils
-Requires(pre):  coreutils
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildArch:  noarch
 
@@ -71,33 +69,6 @@
 patch -p0 %{buildroot}%{_sysconfdir}/services < 
$RPM_SOURCE_DIR/services-suse.diff
 rm -f %{buildroot}%{_sysconfdir}/services.orig
 
-%pre
-# HOSTNAME migration supported scenarios [bnc#858908]:
-# /etc/HOSTNAME -> /etc/hostname content preservation.
-# If hostname and HOSTNAME both exist HOSTNAME wins.
-# Nothing apart from content of the document is preserved
-# REMOVE after SLE11/openSUSE-13.1 out of MIGRATION support
-if [ $1 -gt 1 ]; then
-  if [ -f %{_sysconfdir}/HOSTNAME -a ! -L %{_sysconfdir}/HOSTNAME ]; then
-cat %{_sysconfdir}/HOSTNAME > %{_sysconfdir}/hostname.rpmsave
-rm -rf %{_sysconfdir}/HOSTNAME %{_sysconfdir}/hostname
-touch %{_sysconfdir}/hostname
-  fi
-fi
-exit 0
-
-%post
-# If the defaultdomain changed just prune it, user is not interested in
-# 0 size file anyway
-if [ -f %{_sysconfdir}/defaultdomain.rpmnew ]; then
-  rm -f %{_sysconfdir}/defaultdomain.rpmnew
-fi
-if [ -f %{_sysconfdir}/hostname.rpmsave ]; then
-  cat %{_sysconfdir}/hostname.rpmsave > %{_sysconfdir}/hostname
-  rm -rf %{_sysconfdir}/HOSTNAME.rpmsave %{_sysconfdir}/hostname.rpmsave
-fi
-exit 0
-
 %files
 %defattr(644,root,root,755)
 %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hostname



++ services-suse.diff ++
--- /var/tmp/diff_new_pack.xjs0W0/_old  2019-05-06 13:16:59.067905077 +0200
+++ /var/tmp/diff_new_pack.xjs0W0/_new  2019-05-06 13:16:59.067905077 +0200
@@ -1,5 +1,5 @@
 services.old   2016-01-05 10:57:51.955599939 +0100
-+++ services   2016-01-05 11:03:07.600728374 +0100
+--- ./services 2019/04/26 12:53:51 1.1
 ./services 2019/04/26 13:01:49
 @@ -1,4 +1,16 @@
  #
 +# Network services, Internet style
@@ -16,7 +16,7 @@
 +#
  # SERVICE NAME AND TRANSPORT PROTOCOL PORT NUMBER REGISTRY
  #
- # (last updated on 2015-12-28)
+ # (last updated on 2019-04-15)
 @@ -133,8 +145,8 @@
  name   42/udp   # Host Name Server 
  nameserver 42/tcp   # Host Name Server 
@@ -39,7 +39,7 @@
  mcidas 112/tcp  # McIDAS Data Transmission Protocol  
[Glenn_Davis]
  mcidas 112/udp  # McIDAS Data Transmission Protocol  
[Glenn_Davis]
  ident  113/tcp  
-@@ -1475,6 +1487,7 @@
+@@ -1479,6 +1491,7 @@
  cddbp  888/tcp  # CD Database Protocol  [Steve_Scherf]
  omginitialrefs 900/tcp  # OMG Initial Refs  [Christian_Callsen]
  omginitialrefs 900/udp  # OMG Initial Refs  [Christian_Callsen]
@@ -47,7 +47,7 @@
  smpnameres 901/tcp  # SMPNAMERES  [Leif_Ekblad]
  smpnameres 901/udp  # SMPNAMERES  [Leif_Ekblad]
  ideafarm-door  902/tcp  # self documenting Telnet Door 
-@@ -3505,6 +3518,9 @@
+@@ -3515,6 +3528,9 @@
  x25-svc-port   1998/udp # cisco X.25 service (XOT) 
  tcp-id-port1999/tcp # cisco identification port 
  tcp-id-port1999/udp # cisco identification port 
@@ -57,7 +57,7 @@
  cisco-sccp 2000/tcp # Cisco SCCP  [Dan_Wing]
  cisco-sccp 2000/udp # Cisco SCCp  [Dan_Wing]
  dc 2001/tcp 
-@@ -3604,8 +3620,8 @@
+@@ -3614,8 

<    1   2