Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sispmctl for openSUSE:Factory checked in at 2024-10-30 22:57:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sispmctl (Old) and /work/SRC/openSUSE:Factory/.sispmctl.new.2020 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sispmctl" Wed Oct 30 22:57:25 2024 rev:11 rq:1219588 version:4.12 Changes: -------- --- /work/SRC/openSUSE:Factory/sispmctl/sispmctl.changes 2023-07-10 16:40:24.942727027 +0200 +++ /work/SRC/openSUSE:Factory/.sispmctl.new.2020/sispmctl.changes 2024-10-30 22:57:26.889870357 +0100 @@ -1,0 +2,8 @@ +Fri Oct 25 15:12:03 UTC 2024 - Matthias Brugger <[email protected]> + +- Update to 4.12 + * mention /etc/sispmctl/password in manpage + * add favicon.ico + * on USB retry always use the original control data + +------------------------------------------------------------------- Old: ---- sispmctl-4.11.tar.gz New: ---- sispmctl-4.12.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sispmctl.spec ++++++ --- /var/tmp/diff_new_pack.T5YZ5R/_old 2024-10-30 22:57:27.613900112 +0100 +++ /var/tmp/diff_new_pack.T5YZ5R/_new 2024-10-30 22:57:27.613900112 +0100 @@ -1,7 +1,7 @@ # # spec file for package sispmctl # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define libname libsispmctl0 Name: sispmctl -Version: 4.11 +Version: 4.12 Release: 0 Summary: SIS-PM Control for Linux License: GPL-2.0-only ++++++ sispmctl-4.11.tar.gz -> sispmctl-4.12.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sispmctl-4.11/ChangeLog new/sispmctl-4.12/ChangeLog --- old/sispmctl-4.11/ChangeLog 2023-07-06 22:08:04.000000000 +0200 +++ new/sispmctl-4.12/ChangeLog 2024-05-04 18:43:47.000000000 +0200 @@ -1,3 +1,9 @@ +04 May 2024 - 4.12 + snapcraft: use local source for building + Mention /etc/sispmctl/password in man-page + Add favicon.ico + Always use original control data for libusb calls + 06 Jul 2023 - 4.11 Create /etc/sispmctl/ in passwordsetup.sh Avoid incorrect web output if not in quiet mode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sispmctl-4.11/admin/ltmain.sh new/sispmctl-4.12/admin/ltmain.sh --- old/sispmctl-4.11/admin/ltmain.sh 2023-07-06 22:13:56.000000000 +0200 +++ new/sispmctl-4.12/admin/ltmain.sh 2024-05-04 18:49:00.000000000 +0200 @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.7 Debian-2.4.7-5" +VERSION="2.4.7 Debian-2.4.7-7build1" package_revision=2.4.7 @@ -572,27 +572,15 @@ # --------------------- # Append VALUE onto the existing contents of VAR. - # We should try to minimise forks, especially on Windows where they are - # unreasonably slow, so skip the feature probes when bash or zsh are - # being used: - if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then - : ${_G_HAVE_ARITH_OP="yes"} - : ${_G_HAVE_XSI_OPS="yes"} - # The += operator was introduced in bash 3.1 - case $BASH_VERSION in - [12].* | 3.0 | 3.0*) ;; - *) - : ${_G_HAVE_PLUSEQ_OP="yes"} - ;; - esac - fi - # _G_HAVE_PLUSEQ_OP # Can be empty, in which case the shell is probed, "yes" if += is # useable or anything else if it does not work. - test -z "$_G_HAVE_PLUSEQ_OP" \ - && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ - && _G_HAVE_PLUSEQ_OP=yes + if test -z "$_G_HAVE_PLUSEQ_OP" && \ + __PLUSEQ_TEST="a" && \ + __PLUSEQ_TEST+=" b" 2>/dev/null && \ + test "a b" = "$__PLUSEQ_TEST"; then + _G_HAVE_PLUSEQ_OP=yes + fi if test yes = "$_G_HAVE_PLUSEQ_OP" then @@ -2308,7 +2296,7 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.7-5 + version: $progname $scriptversion Debian-2.4.7-7build1 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sispmctl-4.11/configure new/sispmctl-4.12/configure --- old/sispmctl-4.11/configure 2023-07-06 22:13:57.000000000 +0200 +++ new/sispmctl-4.12/configure 2024-05-04 18:49:01.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for sispmctl 4.11. +# Generated by GNU Autoconf 2.71 for sispmctl 4.12. # # Report bugs to <[email protected]>. # @@ -621,8 +621,8 @@ # Identity of this package. PACKAGE_NAME='sispmctl' PACKAGE_TARNAME='sispmctl' -PACKAGE_VERSION='4.11' -PACKAGE_STRING='sispmctl 4.11' +PACKAGE_VERSION='4.12' +PACKAGE_STRING='sispmctl 4.12' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1378,7 +1378,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sispmctl 4.11 to adapt to many kinds of systems. +\`configure' configures sispmctl 4.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1450,7 +1450,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sispmctl 4.11:";; + short | recursive ) echo "Configuration of sispmctl 4.12:";; esac cat <<\_ACEOF @@ -1574,7 +1574,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sispmctl configure 4.11 +sispmctl configure 4.12 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1982,7 +1982,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sispmctl $as_me 4.11, which was +It was created by sispmctl $as_me 4.12, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3367,7 +3367,7 @@ # Define the identity of the package. PACKAGE='sispmctl' - VERSION='4.11' + VERSION='4.12' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -15409,7 +15409,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sispmctl $as_me 4.11, which was +This file was extended by sispmctl $as_me 4.12, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15477,7 +15477,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -sispmctl config.status 4.11 +sispmctl config.status 4.12 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sispmctl-4.11/configure.ac new/sispmctl-4.12/configure.ac --- old/sispmctl-4.11/configure.ac 2023-07-06 22:08:21.000000000 +0200 +++ new/sispmctl-4.12/configure.ac 2024-05-04 18:39:50.000000000 +0200 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.59]) -AC_INIT([sispmctl], [4.11], [[email protected]]) +AC_INIT([sispmctl], [4.12], [[email protected]]) AC_CONFIG_AUX_DIR(admin) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sispmctl-4.11/man/sispmctl.1 new/sispmctl-4.12/man/sispmctl.1 --- old/sispmctl-4.11/man/sispmctl.1 2023-07-06 22:13:43.000000000 +0200 +++ new/sispmctl-4.12/man/sispmctl.1 2024-05-04 18:48:15.000000000 +0200 @@ -1,7 +1,7 @@ .\" Process this file with .\" groff -man -Tascii foo.1 .\" -.TH sispmctl 1 "Jul 2023" Linux "User Manuals" +.TH sispmctl 1 "May 2024" Linux "User Manuals" .SH NAME sispmctl \- manage EnerGenie and Gembird USB controlled power strips @@ -50,8 +50,8 @@ .IP \-L start listening as a simple http webserver without daemonizing .IP \-p -IP network port (default: 2638) for listener. There is no authentication -implemented yet. +IP network port (default: 2638) for listener. A web-user and password can be +defined in /etc/sispmctl/password. .IP \-u give the directory path where pages lie, that are served (default: /usr/local/share/doc/sispmctl/skin. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sispmctl-4.11/src/Makefile.am new/sispmctl-4.12/src/Makefile.am --- old/sispmctl-4.11/src/Makefile.am 2023-07-06 22:13:13.000000000 +0200 +++ new/sispmctl-4.12/src/Makefile.am 2024-05-04 18:51:13.000000000 +0200 @@ -1,5 +1,5 @@ libsispmctl_la_LDFLAGS = \ - -version-info 2:2:2 + -version-info 2:3:2 bin_PROGRAMS = sispmctl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sispmctl-4.11/src/Makefile.in new/sispmctl-4.12/src/Makefile.in --- old/sispmctl-4.11/src/Makefile.in 2023-07-06 22:13:59.000000000 +0200 +++ new/sispmctl-4.12/src/Makefile.in 2024-05-04 18:51:17.000000000 +0200 @@ -353,7 +353,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ libsispmctl_la_LDFLAGS = \ - -version-info 2:2:2 + -version-info 2:3:2 lib_LTLIBRARIES = libsispmctl.la sispmctl_LDADD = libsispmctl.la diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sispmctl-4.11/src/sispm_ctl.c new/sispmctl-4.12/src/sispm_ctl.c --- old/sispmctl-4.11/src/sispm_ctl.c 2022-04-02 13:21:46.000000000 +0200 +++ new/sispmctl-4.12/src/sispm_ctl.c 2024-05-04 18:33:09.000000000 +0200 @@ -43,21 +43,34 @@ return dev->descriptor.idProduct; } -int usb_control_msg_tries(usb_dev_handle *dev, int requesttype, int request, - int value, int index, char *bytes, int size, - int timeout) +static int usb_control_msg_tries(usb_dev_handle *dev, int requesttype, + int request, int value, int index, + char *bytes, size_t size, int timeout) { - int ret, i=0; + int ret; + char buf[64]; - do { - usleep(500*i); - ret = usb_control_msg(dev, requesttype, request, value, index, bytes, size, - timeout); - i++; - } while ((ret != size) && (i < 5)); - return ret; + if (size > sizeof(buf)) { + return -1; + } + + for (int i = 0; i < 5; ++i) { + usleep(500 * i); + memcpy(buf, bytes, size); + ret = usb_control_msg(dev, requesttype, request, value, index, + buf, size, timeout); + if (ret == size) { + break; + } + } + + memcpy(bytes, buf, size); + + return ret; } + + // for identification: reqtype=a1, request=01, b1=0x01, size=5 char *get_serial(usb_dev_handle *udev) {
