Hello community,
here is the log from the commit of package yast2-scanner for openSUSE:Factory
checked in at 2018-04-26 13:28:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-scanner (Old)
and /work/SRC/openSUSE:Factory/.yast2-scanner.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-scanner"
Thu Apr 26 13:28:45 2018 rev:51 rq:596215 version:4.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-scanner/yast2-scanner.changes
2017-04-12 17:09:33.255845587 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-scanner.new/yast2-scanner.changes
2018-04-26 13:28:46.820416949 +0200
@@ -1,0 +2,14 @@
+Thu Apr 12 06:21:10 UTC 2018 - knut.anders...@suse.com
+
+- bnc#859353
+ - Adapted setup_network_scanner_config using the systemd sane
+ socket unit when exists.
+- 4.0.1
+
+-------------------------------------------------------------------
+Fri Apr 6 18:53:38 UTC 2018 - mfi...@suse.com
+
+- bnc#1087957 - version bump
+- 4.0.0
+
+-------------------------------------------------------------------
Old:
----
yast2-scanner-3.2.1.tar.bz2
New:
----
yast2-scanner-4.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-scanner.spec ++++++
--- /var/tmp/diff_new_pack.DnMaqn/_old 2018-04-26 13:28:47.344397758 +0200
+++ /var/tmp/diff_new_pack.DnMaqn/_new 2018-04-26 13:28:47.344397758 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-scanner
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -17,7 +17,7 @@
Name: yast2-scanner
-Version: 3.2.1
+Version: 4.0.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-scanner-3.2.1.tar.bz2 -> yast2-scanner-4.0.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-scanner-3.2.1/package/yast2-scanner.changes
new/yast2-scanner-4.0.1/package/yast2-scanner.changes
--- old/yast2-scanner-3.2.1/package/yast2-scanner.changes 2017-04-05
09:50:16.103259943 +0200
+++ new/yast2-scanner-4.0.1/package/yast2-scanner.changes 2018-04-13
10:16:59.000000000 +0200
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Thu Apr 12 06:21:10 UTC 2018 - knut.anders...@suse.com
+
+- bnc#859353
+ - Adapted setup_network_scanner_config using the systemd sane
+ socket unit when exists.
+- 4.0.1
+
+-------------------------------------------------------------------
+Fri Apr 6 18:53:38 UTC 2018 - mfi...@suse.com
+
+- bnc#1087957 - version bump
+- 4.0.0
+
+-------------------------------------------------------------------
Tue Apr 4 08:22:53 UTC 2017 - mfi...@suse.com
- bnc#1026027
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-scanner-3.2.1/package/yast2-scanner.spec
new/yast2-scanner-4.0.1/package/yast2-scanner.spec
--- old/yast2-scanner-3.2.1/package/yast2-scanner.spec 2017-04-05
09:50:16.103259943 +0200
+++ new/yast2-scanner-4.0.1/package/yast2-scanner.spec 2018-04-13
10:16:59.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-scanner
-Version: 3.2.1
+Version: 4.0.1
Release: 0
Group: System/YaST
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-scanner-3.2.1/tools/setup_network_scanner_config
new/yast2-scanner-4.0.1/tools/setup_network_scanner_config
--- old/yast2-scanner-3.2.1/tools/setup_network_scanner_config 2017-04-05
09:50:16.135259943 +0200
+++ new/yast2-scanner-4.0.1/tools/setup_network_scanner_config 2018-04-13
10:16:59.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/bash
-# Johannes Meixner <jsm...@suse.de>, 2004, 2005, 2006, 2007, 2008, 2010, 2014
+# Johannes Meixner <jsm...@suse.de>, 2004, 2005, 2006, 2007, 2008, 2010, 2014,
2018
#
# Copyright (c) 2010 Novell, Inc.
# All Rights Reserved.
@@ -40,6 +40,8 @@
XINETD_CONFIG_FILE="/etc/xinetd.d/sane-port"
XINETD_SYSTEMD_UNIT="xinetd.service"
XINETD_SYSTEMD_UNIT_FILE="/usr/lib/systemd/system/$XINETD_SYSTEMD_UNIT"
+SANED_SYSTEMD_UNIT="saned.socket"
+SANED_SYSTEMD_UNIT_FILE="/usr/lib/systemd/system/$SANED_SYSTEMD_UNIT"
# Function to remove old entries and append new entries to a SANE config file:
ReWrite()
@@ -69,25 +71,47 @@
# Enable the saned if "$SANED_CONFIG" is not the empty string otherwise
disable the saned
# and do the appropriate stuff regarding the xinetd:
if [ -n "$SANED_CONFIG" ]
-then sed -i -e 's/^.*disable.*$/\tdisable = no/' $XINETD_CONFIG_FILE || {
echo "Failed to enable saned in $XINETD_CONFIG_FILE" 1>&2 ; exit 6 ; }
+then # First try the newest way (i.e. reload or start and enable
SANED_SYSTEMD_UNIT)
+ # otherwise fall back to the older ways (i.e via xinetd):
+ if test -e $SANED_SYSTEMD_UNIT_FILE
+ then if systemctl --quiet is-active $SANED_SYSTEMD_UNIT && systemctl
--quiet is-enabled $SANED_SYSTEMD_UNIT
+ then systemctl --quiet reload $SANED_SYSTEMD_UNIT || { echo "Failed
to reload $SANED_SYSTEMD_UNIT" 1>&2 ; exit 7 ; }
+ else systemctl --quiet start $SANED_SYSTEMD_UNIT || { echo "Failed
to start $SANED_SYSTEMD_UNIT" 1>&2 ; exit 8 ; }
+ systemctl --quiet enable $SANED_SYSTEMD_UNIT || { echo "Failed
to enable $SANED_SYSTEMD_UNIT" 1>&2 ; exit 9 ; }
+ fi
+ exit 0
+ fi
+ echo "Cannot reload or start and enable $SANED_SYSTEMD_UNIT (no
$SANED_SYSTEMD_UNIT_FILE)." 1>&2
+ echo "Falling back to reload or start and enable $XINETD_SYSTEMD_UNIT."
1>&2
+ sed -i -e 's/^.*disable.*$/\tdisable = no/' $XINETD_CONFIG_FILE || {
echo "Failed to enable saned in $XINETD_CONFIG_FILE" 1>&2 ; exit 6 ; }
if test -e $XINETD_SYSTEMD_UNIT_FILE
then if systemctl --quiet is-active $XINETD_SYSTEMD_UNIT && systemctl
--quiet is-enabled $XINETD_SYSTEMD_UNIT
- then systemctl --quiet reload $XINETD_SYSTEMD_UNIT || { echo "Failed
to reload xinetd" 1>&2 ; exit 7 ; }
- else systemctl --quiet start $XINETD_SYSTEMD_UNIT || { echo "Failed
to start xinetd" 1>&2 ; exit 8 ; }
- systemctl --quiet enable $XINETD_SYSTEMD_UNIT || { echo "Failed
to enable xinetd" 1>&2 ; exit 9 ; }
+ then systemctl --quiet reload $XINETD_SYSTEMD_UNIT || { echo "Failed
to reload $XINETD_SYSTEMD_UNIT" 1>&2 ; exit 7 ; }
+ else systemctl --quiet start $XINETD_SYSTEMD_UNIT || { echo "Failed
to start $XINETD_SYSTEMD_UNIT" 1>&2 ; exit 8 ; }
+ systemctl --quiet enable $XINETD_SYSTEMD_UNIT || { echo "Failed
to enable $XINETD_SYSTEMD_UNIT" 1>&2 ; exit 9 ; }
fi
exit 0
fi
- echo "Cannot reload or start and enable xinetd (no
$XINETD_SYSTEMD_UNIT_FILE)." 1>&2
+ echo "Cannot reload or start and enable $XINETD_SYSTEMD_UNIT (no
$XINETD_SYSTEMD_UNIT_FILE)." 1>&2
exit 11
-else sed -i -e 's/^.*disable.*$/\tdisable = yes/' $XINETD_CONFIG_FILE || {
echo "Failed to disable saned in $XINETD_CONFIG_FILE" 1>&2 ; exit 10 ; }
+else # First try the newest way (i.e. stop and disable SANED_SYSTEMD_UNIT)
+ # otherwise fall back to the older ways (i.e via xinetd):
+ if test -e $SANED_SYSTEMD_UNIT_FILE
+ then # Do not error out if stop and/or disable SANED_SYSTEMD_UNIT does
not work, perhaps it is already stopped and/or disabled:
+ systemctl --quiet stop $SANED_SYSTEMD_UNIT || echo "Could not stop
$SANED_SYSTEMD_UNIT" 1>&2
+ systemctl --quiet disable $SANED_SYSTEMD_UNIT || echo "Could not
disable $SANED_SYSTEMD_UNIT" 1>&2
+ exit 0
+ fi
+ echo "Cannot stop and disable $SANED_SYSTEMD_UNIT (no
$SANED_SYSTEMD_UNIT_FILE)." 1>&2
+ echo "Falling back to disable saned for xinetd and reload
$XINETD_SYSTEMD_UNIT." 1>&2
+ sed -i -e 's/^.*disable.*$/\tdisable = yes/' $XINETD_CONFIG_FILE || {
echo "Failed to disable saned in $XINETD_CONFIG_FILE" 1>&2 ; exit 10 ; }
if test -e $XINETD_SYSTEMD_UNIT_FILE
then if systemctl --quiet is-active $XINETD_SYSTEMD_UNIT
- then systemctl --quiet reload $XINETD_SYSTEMD_UNIT || { echo "Failed
to reload xinetd" 1>&2 ; exit 7 ; }
+ then systemctl --quiet reload $XINETD_SYSTEMD_UNIT || { echo "Failed
to reload $XINETD_SYSTEMD_UNIT" 1>&2 ; exit 7 ; }
fi
exit 0
fi
- echo "Cannot reload xinetd (no $XINETD_SYSTEMD_UNIT_FILE)." 1>&2
+ echo "Cannot reload $XINETD_SYSTEMD_UNIT (no $XINETD_SYSTEMD_UNIT_FILE)."
1>&2
exit 11
fi
