Hello community, here is the log from the commit of package yast2-scanner for openSUSE:Factory checked in at 2017-04-12 17:09:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-scanner (Old) and /work/SRC/openSUSE:Factory/.yast2-scanner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-scanner" Wed Apr 12 17:09:31 2017 rev:50 rq:485754 version:3.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-scanner/yast2-scanner.changes 2016-06-10 23:59:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-scanner.new/yast2-scanner.changes 2017-04-12 17:09:33.255845587 +0200 @@ -1,0 +2,14 @@ +Tue Apr 4 08:22:53 UTC 2017 - [email protected] + +- bnc#1026027 + - dropped call to insserv when enabling xinetd +- 3.2.1 + +------------------------------------------------------------------- +Mon Apr 3 08:33:51 UTC 2017 - [email protected] + +- bnc#1026027 + - dropped calls to insserv related to HP's obsoleted services. +- 3.2.0 + +------------------------------------------------------------------- Old: ---- yast2-scanner-3.1.3.tar.bz2 New: ---- yast2-scanner-3.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-scanner.spec ++++++ --- /var/tmp/diff_new_pack.alasMV/_old 2017-04-12 17:09:34.063731223 +0200 +++ /var/tmp/diff_new_pack.alasMV/_new 2017-04-12 17:09:34.067730656 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-scanner # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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.1.3 +Version: 3.2.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-scanner-3.1.3.tar.bz2 -> yast2-scanner-3.2.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-3.1.3/.travis.yml new/yast2-scanner-3.2.1/.travis.yml --- old/yast2-scanner-3.1.3/.travis.yml 2016-06-07 13:58:25.106214132 +0200 +++ new/yast2-scanner-3.2.1/.travis.yml 2017-04-05 09:50:16.099259943 +0200 @@ -1,16 +1,11 @@ -language: cpp -compiler: - - gcc +sudo: required +language: bash +services: + - docker + before_install: - # disable rvm, use system Ruby - - rvm reset - - wget https://raw.githubusercontent.com/yast/yast-devtools/SLE-12-GA/travis-tools/travis_setup.sh - - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 libx11-dev" -g "yast-rake gettext" + - docker build -t yast-scanner-image . script: - - rake check:syntax - - rake check:pot - - make -f Makefile.cvs - - make - - sudo make install - - make check - + # the "yast-travis-cpp" script is included in the base yastdevel/cpp image + # see https://github.com/yast/docker-yast-cpp/blob/master/yast-travis-cpp + - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-scanner-image yast-travis-cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-3.1.3/CONTRIBUTING.md new/yast2-scanner-3.2.1/CONTRIBUTING.md --- old/yast2-scanner-3.1.3/CONTRIBUTING.md 2016-06-07 13:58:25.118214132 +0200 +++ new/yast2-scanner-3.2.1/CONTRIBUTING.md 2017-04-05 09:50:16.099259943 +0200 @@ -3,7 +3,7 @@ YaST is an open source project and as such it welcomes all kinds of contributions. If you decide to contribute, please follow these guidelines to -ensure the process is effective and pleasant both for you and YaST maintainers. +ensure the process is effective and pleasant both for you and the YaST maintainers. There are two main forms of contribution: reporting bugs and performing code changes. @@ -17,13 +17,11 @@ registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) if you don't have an account yet.) -If you find a problem, please report it either using -[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee -that every bug will be fixed, but we'll try. - When creating a bug report, please follow our [bug reporting guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). +We can't guarantee that every bug will be fixed, but we'll try. + Code Changes ------------ @@ -44,15 +42,22 @@ to the [Ruby style guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). - 4. Make sure your change didn't break anything by building the RPM package + 4. Update the package version (in `packages/*.spec`, usually by + `rake version:bump`) and add a new entry to the `package/*.changes` file + (by `osc vc package`). + For bigger changes or changes which need longer discussion it is advised to + add this as a separate last commit so it can be easily updated when another + change is merged in the meantime. + + 5. Make sure your change didn't break anything by building the RPM package (`rake osc:build`). The build process includes running the full testsuite. - 5. Publish the branch and create a pull request. + 6. Publish the branch and create a pull request. - 6. YaST developers will review your change and possibly point out issues. + 7. YaST developers will review your change and possibly point out issues. Adapt the code under their guidance until they are all resolved. - 7. Finally, the pull request will get merged or rejected. + 8. Finally, the pull request will get merged or rejected. See also [GitHub's guide on contributing](https://help.github.com/articles/fork-a-repo). @@ -60,9 +65,6 @@ If you want to do multiple unrelated changes, use separate branches and pull requests. -Do not change the `VERSION` and `*.changes` files as this could lead to -conflicts. - ### Commits Each commit in the pull request should do only one thing, which is clearly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-3.1.3/Dockerfile new/yast2-scanner-3.2.1/Dockerfile --- old/yast2-scanner-3.1.3/Dockerfile 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-scanner-3.2.1/Dockerfile 2017-04-05 09:50:16.099259943 +0200 @@ -0,0 +1,8 @@ +FROM yastdevel/cpp +RUN zypper --gpg-auto-import-keys --non-interactive in --no-recommends \ + xorg-x11-libX11-devel \ + yast2 \ + yast2-testsuite + +COPY . /usr/src/app + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-3.1.3/package/yast2-scanner.changes new/yast2-scanner-3.2.1/package/yast2-scanner.changes --- old/yast2-scanner-3.1.3/package/yast2-scanner.changes 2016-06-07 13:58:25.178214132 +0200 +++ new/yast2-scanner-3.2.1/package/yast2-scanner.changes 2017-04-05 09:50:16.103259943 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Tue Apr 4 08:22:53 UTC 2017 - [email protected] + +- bnc#1026027 + - dropped call to insserv when enabling xinetd +- 3.2.1 + +------------------------------------------------------------------- +Mon Apr 3 08:33:51 UTC 2017 - [email protected] + +- bnc#1026027 + - dropped calls to insserv related to HP's obsoleted services. +- 3.2.0 + +------------------------------------------------------------------- Tue Jun 7 11:15:38 UTC 2016 - [email protected] - Stop generating autodocs (fate#320356) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-3.1.3/package/yast2-scanner.spec new/yast2-scanner-3.2.1/package/yast2-scanner.spec --- old/yast2-scanner-3.1.3/package/yast2-scanner.spec 2016-06-07 13:58:25.178214132 +0200 +++ new/yast2-scanner-3.2.1/package/yast2-scanner.spec 2017-04-05 09:50:16.103259943 +0200 @@ -17,7 +17,7 @@ Name: yast2-scanner -Version: 3.1.3 +Version: 3.2.1 Release: 0 Group: System/YaST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-3.1.3/src/modules/Scanner.rb new/yast2-scanner-3.2.1/src/modules/Scanner.rb --- old/yast2-scanner-3.1.3/src/modules/Scanner.rb 2016-06-07 13:58:25.194214132 +0200 +++ new/yast2-scanner-3.2.1/src/modules/Scanner.rb 2017-04-05 09:50:16.135259943 +0200 @@ -266,8 +266,6 @@ @activate_backend_commandline = "/usr/lib/YaST2/bin/activate_scanner_backend" @deactivate_backend_commandline = "/usr/lib/YaST2/bin/deactivate_scanner_backend" @test_backend_commandline = "/usr/lib/YaST2/bin/test_scanner_backend" - @setup_ptal_scanner_service_commandline = "/usr/lib/YaST2/bin/setup_ptal_scanner_service" - @setup_hplip_scanner_service_commandline = "/usr/lib/YaST2/bin/setup_hplip_scanner_service" @network_scanning_config_filename = "/var/lib/YaST2/network_scanning_config.ycp" @determine_network_scanning_config_commandline = Ops.add( "/usr/lib/YaST2/bin/determine_network_scanner_config YCP >", @@ -2077,17 +2075,6 @@ end end end - # No conflicting print queue was found or - # a conflicting print queue was found but the user forced to proceed. - # Since HPLIP version 2.8.4 there are no longer any startup daemons. - # The hplip init script was adapted to provide backward compatibility: - # It still exists to avoid that printer/scanner setup tools fail - # when they try to enable the "hplip" service but all it does - # is to stop a possibly running hpssd. - # All what /usr/lib/YaST2/bin/setup_hplip_scanner_service still does - # is to disable both ptal and hplip completely if such a service exists. - # There is no need to care about the exit code because it exits successfully in any case: - ExecuteBashCommand(@setup_hplip_scanner_service_commandline) end # The hpoj backend (from the package hp-officeJet) requires the PTAL service to be up and running. # Before starting the PTAL service works it must have been initialized. @@ -2120,19 +2107,6 @@ return false end end - # No conflicting print queue was found or - # a conflicting print queue was found but the user forced to proceed: - if !ExecuteBashCommand(@setup_ptal_scanner_service_commandline) - Popup.ErrorDetails( - # Only a simple message because this error does not happen on a normal system - # (i.e. a system which is not totally broken or totally messed up). - # Do not change or translate "PTAL", it is a subsystem name. - _("Failed to set up the PTAL system."), - Ops.get_string(@result, "stderr", "") - ) - Progress.Title(_("Aborted")) - return false - end end end # Activate the backend via bash script: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-3.1.3/tools/Makefile.am new/yast2-scanner-3.2.1/tools/Makefile.am --- old/yast2-scanner-3.1.3/tools/Makefile.am 2016-06-07 13:58:25.194214132 +0200 +++ new/yast2-scanner-3.2.1/tools/Makefile.am 2017-04-05 09:50:16.135259943 +0200 @@ -8,8 +8,6 @@ activate_scanner_backend \ deactivate_scanner_backend \ test_scanner_backend \ - setup_ptal_scanner_service \ - setup_hplip_scanner_service \ determine_network_scanner_config \ setup_network_scanner_config diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-3.1.3/tools/setup_hplip_scanner_service new/yast2-scanner-3.2.1/tools/setup_hplip_scanner_service --- old/yast2-scanner-3.1.3/tools/setup_hplip_scanner_service 2016-06-07 13:58:25.198214132 +0200 +++ new/yast2-scanner-3.2.1/tools/setup_hplip_scanner_service 1970-01-01 01:00:00.000000000 +0100 @@ -1,50 +0,0 @@ -#! /bin/bash - -# Johannes Meixner <[email protected]>, 2004, 2005, 2006, 2007, 2008, 2010 -# -# Copyright (c) 2010 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 - -#set -x - -export PATH="/sbin:/usr/sbin:/usr/bin:/bin" -export LC_ALL="POSIX" -export LANG="POSIX" -umask 022 - -# The hpaio driver and the ptal service exclude each other. -# Disable the ptal service if it exists: -if [ -x /etc/init.d/ptal ] -then /etc/init.d/ptal stop - insserv -r ptal -fi - -# Since HPLIP version 2.8.4 there are no longer any startup daemons. -# The hplip init script was adapted to provide backward compatibility: -# It still exists to avoid that printer/scanner setup tools fail -# when they try to enable the "hplip" service but all it does -# is to stop a possibly running hpssd. -# To be on the safe side, disable the hplip service if it exists: -if [ -x /etc/init.d/hplip ] -then /etc/init.d/hplip stop - insserv -r hplip -fi - -# Exit successfully in any case: -exit 0 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-3.1.3/tools/setup_network_scanner_config new/yast2-scanner-3.2.1/tools/setup_network_scanner_config --- old/yast2-scanner-3.1.3/tools/setup_network_scanner_config 2016-06-07 13:58:25.226214132 +0200 +++ new/yast2-scanner-3.2.1/tools/setup_network_scanner_config 2017-04-05 09:50:16.135259943 +0200 @@ -38,7 +38,6 @@ ACTIVATE_BACKEND=${0%/*}/activate_scanner_backend DEACTIVATE_BACKEND=${0%/*}/deactivate_scanner_backend XINETD_CONFIG_FILE="/etc/xinetd.d/sane-port" -XINETD_INIT_SCRIPT="/etc/init.d/xinetd" XINETD_SYSTEMD_UNIT="xinetd.service" XINETD_SYSTEMD_UNIT_FILE="/usr/lib/systemd/system/$XINETD_SYSTEMD_UNIT" @@ -71,14 +70,6 @@ # 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 ; } - if test -e $XINETD_INIT_SCRIPT - then if $XINETD_INIT_SCRIPT status &>/dev/null - then $XINETD_INIT_SCRIPT reload || { echo "Failed to reload xinetd" 1>&2 ; exit 7 ; } - else $XINETD_INIT_SCRIPT start || { echo "Failed to start xinetd" 1>&2 ; exit 8 ; } - insserv xinetd || { echo "Failed to insserv xinetd" 1>&2 ; exit 9 ; } - fi - exit 0 - fi 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 ; } @@ -87,22 +78,16 @@ fi exit 0 fi - echo "Cannot reload or start and enable xinetd (neither $XINETD_INIT_SCRIPT nor $XINETD_SYSTEMD_UNIT_FILE)" 1>&2 + echo "Cannot reload or start and enable xinetd (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 ; } - if test -e $XINETD_INIT_SCRIPT - then if $XINETD_INIT_SCRIPT status &>/dev/null - then $XINETD_INIT_SCRIPT reload || { echo "Failed to reload xinetd" 1>&2 ; exit 7 ; } - fi - exit 0 - fi 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 ; } fi exit 0 fi - echo "Cannot reload xinetd (neither $XINETD_INIT_SCRIPT nor $XINETD_SYSTEMD_UNIT_FILE)" 1>&2 + echo "Cannot reload xinetd (no $XINETD_SYSTEMD_UNIT_FILE)." 1>&2 exit 11 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-scanner-3.1.3/tools/setup_ptal_scanner_service new/yast2-scanner-3.2.1/tools/setup_ptal_scanner_service --- old/yast2-scanner-3.1.3/tools/setup_ptal_scanner_service 2016-06-07 13:58:25.226214132 +0200 +++ new/yast2-scanner-3.2.1/tools/setup_ptal_scanner_service 1970-01-01 01:00:00.000000000 +0100 @@ -1,68 +0,0 @@ -#! /bin/bash - -# Johannes Meixner <[email protected]>, 2004, 2005, 2006, 2007, 2008, 2010 -# -# Copyright (c) 2010 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 - -#set -x - -export PATH="/sbin:/usr/sbin:/usr/bin:/bin" -export LC_ALL="POSIX" -export LANG="POSIX" -umask 022 - -# The ptal service and the hplip service exclude each other. -# Disable the hplip service if it exists: -if [ -x /etc/init.d/hplip ] -then /etc/init.d/hplip stop - insserv -r hplip -fi - -# Setup ptal USB devices: -MAXIMUM_WAIT="60" -# 'ptal-init setup-usb' exits with non-zero exit code when it is running in the background. -# Therefore a simple time bomb background process is started before it. -# This time bomb background process process is normally killed at the end. -# As a signal is processed not until a "sleep" has finished, -# it is crucial not to do simply "sleep $MAXIMUM_WAIT" -# but to do "for i in $( seq $MAXIMUM_WAIT ) ; do sleep 1 ; done" -# otherwise it would wait in any case until "sleep $MAXIMUM_WAIT" has finished. -if [ -x /usr/sbin/ptal-init ] -then ( for i in $( seq $MAXIMUM_WAIT ) ; do sleep 1 ; done ; killall -9 ptal-init &>/dev/null ) & - timebombPID=$! - ptal-init setup-usb &>/dev/null || { echo "failed: ptal-init setup-usb" 1>&2 ; exit 2 ; } - # If the timebomb is still running, ptal-init has finished - # and killing the timebomb will be successful. - if kill -9 $timebombPID &>/dev/null - then # Setup the ptal service: - if [ -x /etc/init.d/ptal ] - then insserv ptal || { echo "failed: insserv ptal" 1>&2 ; exit 4 ; } - /etc/init.d/ptal restart || { echo "failed: /etc/init.d/ptal restart" 1>&2 ; exit 5 ; } - else echo "cannot execute /etc/init.d/ptal" 1>&2 - exit 3 - fi - else echo -e "\nAborted ptal-init after $MAXIMUM_WAIT seconds timeout." 1>&2 - exit 6 - fi -else echo "cannot execute /usr/sbin/ptal-init" 1>&2 - exit 1 -fi - -exit 0 -
