May 2019 - openSUSE Commits - openSUSE Mailing Lists

commit xtables-geoip for openSUSE:Factory
by root 24 May '19

24 May '19

Hello community, here is the log from the commit of package xtables-geoip for openSUSE:Factory checked in at 2019-05-24 11:30:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xtables-geoip (Old) and /work/SRC/openSUSE:Factory/.xtables-geoip.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xtables-geoip" Fri May 24 11:30:55 2019 rev:43 rq:704807 version:20190521 Changes: -------- --- /work/SRC/openSUSE:Factory/xtables-geoip/xtables-geoip.changes 2019-02-05 11:18:55.112890609 +0100 +++ /work/SRC/openSUSE:Factory/.xtables-geoip.new.5148/xtables-geoip.changes 2019-05-24 11:30:56.653413279 +0200 @@ -1,0 +2,5 @@ +Wed May 22 16:27:16 UTC 2019 - Jan Engelhardt <jengelh(a)inai.de> + +- Update database files to 20190521 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xtables-geoip.spec ++++++ --- /var/tmp/diff_new_pack.t4nNuw/_old 2019-05-24 11:30:57.501413060 +0200 +++ /var/tmp/diff_new_pack.t4nNuw/_new 2019-05-24 11:30:57.505413059 +0200 @@ -17,13 +17,14 @@ Name: xtables-geoip -Version: 20190129 +Version: 20190521 Release: 0 Summary: Geolocation database files for xt_geoip License: CC-BY-SA-4.0 Group: Productivity/Networking/Security -Url: http://dev.maxmind.com/geoip/legacy/geolite/ +URL: https://dev.maxmind.com/geoip/geoip2/geolite2/ +#DL-URL: https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country-CSV.zip Source: GeoLite2-Country-CSV.zip Source4: %name-rpmlintrc BuildArch: noarch ++++++ GeoLite2-Country-CSV.zip ++++++ Binary files /var/tmp/diff_new_pack.t4nNuw/_old and /var/tmp/diff_new_pack.t4nNuw/_new differ

1 0

commit par for openSUSE:Factory
by root 24 May '19

24 May '19

Hello community, here is the log from the commit of package par for openSUSE:Factory checked in at 2019-05-24 11:30:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/par (Old) and /work/SRC/openSUSE:Factory/.par.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "par" Fri May 24 11:30:53 2019 rev:19 rq:704789 version:1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/par/par.changes 2018-02-20 17:55:40.185180094 +0100 +++ /work/SRC/openSUSE:Factory/.par.new.5148/par.changes 2019-05-24 11:30:54.157413922 +0200 @@ -1,0 +2,30 @@ +Wed May 22 13:42:27 UTC 2019 - Doug Miller <dgm816(a)gmail.com> + +- Corect download url +- Clarify changelog + +------------------------------------------------------------------- +Wed May 22 11:48:54 UTC 2019 - Martin Pluskal <mpluskal(a)suse.com> + +- Update previou changelog entry +- Fix download url + +------------------------------------------------------------------- +Sat May 11 02:14:14 UTC 2019 - Doug Miller <dgm816(a)gmail.com> + +- Revert pacakge to build 'par' using the parchive sources. + + On 2016-11-23 this package was updated to be built from the + 'par2cmdline' sources instead of the 'parchive' sources. These + are different projects (although worked on by some of the same + people, which probably led to some confusion). + + This change converts this project from building par2cmdline + v0.8.0 to building the correct project of parchive v1.2. + + In conjunction with this package fix, a new package called + 'par2cmdline' will be made available to return par2cmdline + v0.8.0 to the repos. +- Re-add par.diff + +------------------------------------------------------------------- Old: ---- par-0.8.0.tar.gz New: ---- par-v1.1.tar.gz par.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ par.spec ++++++ --- /var/tmp/diff_new_pack.y2J0yN/_old 2019-05-24 11:30:54.901413730 +0200 +++ /var/tmp/diff_new_pack.y2J0yN/_new 2019-05-24 11:30:54.909413729 +0200 @@ -1,7 +1,7 @@ # # spec file for package par # -# 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 @@ -12,23 +12,19 @@ # 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/ # Name: par -Version: 0.8.0 +Version: 1.1 Release: 0 -Summary: Parity File Generator -License: GPL-2.0+ -Group: System/Filesystems -URL: https://github.com/Parchive/par2cmdline -Source0: https://github.com/Parchive/par2cmdline/archive/v%{version}.tar.gz#/%{name}… -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gcc-c++ -Provides: %{name} = 1.1 -Obsoletes: %{name} = 1.1 +Summary: Parchive - Parity Archive File Generator +License: GPL-2.0-or-later +Group: Productivity/Archiving/Backup +URL: http://parchive.sourceforge.net/ +Source: https://sourceforge.net/projects/parchive/files/par/%{version}/par-v%{versi… +Patch0: %{name}.diff %description Parchive creates extra parity data over several volumes. These can be @@ -36,27 +32,18 @@ corruption. %prep -%setup -q -n par2cmdline-%{version} +%setup -q -n %{name}-cmdline +%patch0 %build -autoreconf -fiv -%configure make %{?_smp_mflags} -%check -make %{?_smp_mflags} check - %install %make_install -chmod -x ChangeLog %files -%doc README AUTHORS ChangeLog +%doc README AUTHORS NEWS %license COPYING -%{_bindir}/par2 -%{_bindir}/par2create -%{_bindir}/par2repair -%{_bindir}/par2verify -%{_mandir}/man1/par2.1%{ext_man} +%{_bindir}/par %changelog ++++++ par.diff ++++++ --- Makefile +++ Makefile 2004/02/08 19:43:02 @@ -1,5 +1,5 @@ -CFLAGS=-g -W -Wall -Wno-unused -O2 +CFLAGS=-g -W -Wall -Wno-unused $(RPM_OPT_FLAGS) par: backend.o checkpar.o makepar.o rwpar.o rs.o md5.o fileops.o main.o readoldpar.o interface.o ui_text.o $(CC) -o $@ $^ @@ -14,4 +14,5 @@ make CC="dos-gcc -s" install: par - install par ${HOME}/bin/ + install -d $(DESTDIR)/usr/bin/ + install par $(DESTDIR)/usr/bin/

1 0

commit tlp for openSUSE:Factory
by root 24 May '19

24 May '19

Hello community, here is the log from the commit of package tlp for openSUSE:Factory checked in at 2019-05-24 11:30:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tlp (Old) and /work/SRC/openSUSE:Factory/.tlp.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tlp" Fri May 24 11:30:49 2019 rev:12 rq:704782 version:1.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/tlp/tlp.changes 2019-03-19 10:02:52.515808860 +0100 +++ /work/SRC/openSUSE:Factory/.tlp.new.5148/tlp.changes 2019-05-24 11:30:51.689414557 +0200 @@ -1,0 +2,24 @@ +Sun May 19 14:35:37 UTC 2019 - Alexei Sorokin <sor.alexei(a)meowr.ru> + +- Update to version 1.2.2: + * Battery Features, tlp-stat -b: + - Show data for batteries named other than BAT0/BAT1 + (non-ThinkPads). + - ThinkPad X1C6 discharge malfunction (gh#linrunner/TLP#395). + - Separate checks for charge thresholds and recalibration. + - Intelligible recommendation for tp-smapi on + ThinkPad X220/T420 et al. + - Explain "Battery Features: Charge Thresholds and Recalibrate". + * Discs: + - Fix type determination. + * Operation Mode AC/BAT: + - MacBookPro 5.3: Workaround for false AC offline status. + * Processor, tlp-stat -p: + - Fix read of /sys/devices/system/cpu/cpufreq/boost. + - x86_energy_perf_policy: Detect unsupported CPUs in newer + versions. + * Radio Devices: + - Make RESTORE_DEVICE_STATE_ON_STARTUP=1 persistent again + (gh#linrunner/TLP#404). + +------------------------------------------------------------------- Old: ---- TLP-1.2.1.tar.gz New: ---- TLP-1.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tlp.spec ++++++ --- /var/tmp/diff_new_pack.FQ0duD/_old 2019-05-24 11:30:52.577414329 +0200 +++ /var/tmp/diff_new_pack.FQ0duD/_new 2019-05-24 11:30:52.581414328 +0200 @@ -18,7 +18,7 @@ %define _name TLP Name: tlp -Version: 1.2.1 +Version: 1.2.2 Release: 0 Summary: Save battery power on laptops License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -116,6 +116,7 @@ %dir %{_libexecdir}/udev/rules.d/ %{_libexecdir}/udev/%{name}-usb-udev %{_libexecdir}/udev/rules.d/85-%{name}.rules +%{_localstatedir}/lib/%{name}/ %dir %{_datadir}/bash-completion/ %dir %{_datadir}/bash-completion/completions/ %{_datadir}/bash-completion/completions/bluetooth ++++++ TLP-1.2.1.tar.gz -> TLP-1.2.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TLP-1.2.1/.github/Bug_Reporting_Howto.md new/TLP-1.2.2/.github/Bug_Reporting_Howto.md --- old/TLP-1.2.1/.github/Bug_Reporting_Howto.md 2019-03-18 18:08:25.000000000 +0100 +++ new/TLP-1.2.2/.github/Bug_Reporting_Howto.md 2019-05-04 19:49:18.000000000 +0200 @@ -6,11 +6,13 @@ * Followed the appropiate [Installation instructions](https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html#installation) * Read the [Settings guide](https://linrunner.de/en/tlp/docs/tlp-configuration.html) * Carefully checked the [FAQ](https://linrunner.de/en/tlp/docs/tlp-faq.html) +* Checked [existing bug reports](https://github.com/linrunner/TLP/issues) * Tried to isolate the cause as described in [Troubleshooting](https://linrunner.de/en/tlp/docs/tlp-troubleshooting.html) ### What not to report * Missing packages (including tp-smapi and acpi_call) * Asking for help about installation, configuration and usage +* Questions about your laptop's power consumption and how to optimize it * Deviations from powertop's recommendations * Hardware issues e.g. worn out or malfunctioning batteries diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TLP-1.2.1/.github/ISSUE_TEMPLATE/bug_report.md new/TLP-1.2.2/.github/ISSUE_TEMPLATE/bug_report.md --- old/TLP-1.2.1/.github/ISSUE_TEMPLATE/bug_report.md 2019-03-18 18:08:25.000000000 +0100 +++ new/TLP-1.2.2/.github/ISSUE_TEMPLATE/bug_report.md 2019-05-04 19:49:18.000000000 +0200 @@ -24,7 +24,8 @@ 1. Does the problem occur on battery or AC or both? 2. Actions to reproduce the behaviour 3. Shell commands entered and their output -4. **Full output of `tlp-stat` via https://gist.github.com/ for *all* cases of 1** +4. **Full output of `tlp-stat` via https://gist.github.com/ for *all* + matching cases of 1.** **Additional context** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TLP-1.2.1/Makefile new/TLP-1.2.2/Makefile --- old/TLP-1.2.1/Makefile 2019-03-18 18:08:25.000000000 +0100 +++ new/TLP-1.2.2/Makefile 2019-05-04 19:49:18.000000000 +0200 @@ -15,6 +15,7 @@ TLP_MAN ?= /usr/share/man TLP_META ?= /usr/share/metainfo TLP_RUN ?= /run/tlp +TLP_VAR ?= /var/lib/tlp # Catenate DESTDIR to paths _SBIN = $(DESTDIR)$(TLP_SBIN) @@ -31,6 +32,7 @@ _MAN = $(DESTDIR)$(TLP_MAN) _META = $(DESTDIR)$(TLP_META) _RUN = $(DESTDIR)$(TLP_RUN) +_VAR = $(DESTDIR)$(TLP_VAR) SED = sed \ -e "s|@TLP_SBIN@|$(TLP_SBIN)|g" \ @@ -38,7 +40,8 @@ -e "s|@TLP_FLIB@|$(TLP_FLIB)|g" \ -e "s|@TLP_ULIB@|$(TLP_ULIB)|g" \ -e "s|@TLP_CONF@|$(TLP_CONF)|g" \ - -e "s|@TLP_RUN@|$(TLP_RUN)|g" + -e "s|@TLP_RUN@|$(TLP_RUN)|g" \ + -e "s|@TLP_VAR@|$(TLP_VAR)|g" INFILES = \ tlp \ @@ -117,11 +120,11 @@ ifneq ($(TLP_NO_INIT),1) install -D -m 755 tlp.init $(_SYSV)/tlp endif -ifeq ($(TLP_WITH_SYSTEMD),1) +ifneq ($(TLP_WITH_SYSTEMD),0) install -D -m 644 tlp.service $(_SYSD)/tlp.service install -m 644 tlp-sleep.service $(_SYSD)/ endif -ifeq ($(TLP_WITH_ELOGIND),1) +ifneq ($(TLP_WITH_ELOGIND),0) install -D -m 755 tlp-sleep.elogind $(_ELOD)/49-tlp-sleep endif ifneq ($(TLP_NO_BASHCOMP),1) @@ -132,6 +135,7 @@ ln -sf tlp $(_SHCPL)/wwan endif install -D -m 644 de.linrunner.tlp.metainfo.xml $(_META)/de.linrunner.tlp.metainfo.xml + install -d -m 755 $(_VAR) install-rdw: all # Package tlp-rdw @@ -171,7 +175,7 @@ rm -r $(_TLIB) rm $(_ULIB)/tlp-usb-udev rm $(_ULIB)/rules.d/85-tlp.rules - rm -f $(DESTDIR)/etc/init.d/tlp + rm -f $(_SYSV)/tlp rm -f $(_SYSD)/tlp.service rm -f $(_SYSD)/tlp-sleep.service rm -f $(_ELOD)/49-tlp-sleep @@ -181,6 +185,7 @@ rm -f $(_SHCPL)/wwan rm -f $(_SHCPL)/tlp rm -f $(_META)/de.linrunner.tlp.metainfo.xml + rm -r $(_VAR) uninstall-rdw: # Package tlp-rdw diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TLP-1.2.1/changelog new/TLP-1.2.2/changelog --- old/TLP-1.2.1/changelog 2019-03-18 18:08:25.000000000 +0100 +++ new/TLP-1.2.2/changelog 2019-05-04 19:49:18.000000000 +0200 @@ -1,3 +1,22 @@ ++++ 1.2.2 --- 04.05.2019 +++ + + * Bugfixes + Battery Features, tlp-stat -b: + - Show data for batteries named other than BAT0/BAT1 (non-ThinkPads) + - Issue #395: ThinkPad X1C6 discharge malfunction + - Separate checks for charge thresholds and recalibration + - Intelligible recommendation for tp-smapi on ThinkPad X220/T420 et al. + - Explain "Battery Features: Charge Thresholds and Recalibrate" + Disks: + - Fix type determination + Operation Mode AC/BAT: + - MacBookPro 5.3: workaround for false AC offline status + Processor, tlp-stat -p: + - Fix read of /sys/devices/system/cpu/cpufreq/boost + - x86_energy_perf_policy: detect unsupported CPUs in newer versions + Radio Devices: + - Issue #404: make RESTORE_DEVICE_STATE_ON_STARTUP=1 persistent again + +++ 1.2.1 --- 18.03.2019 +++ * Bugfix diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TLP-1.2.1/func.d/15-tlp-func-disk new/TLP-1.2.2/func.d/15-tlp-func-disk --- old/TLP-1.2.1/func.d/15-tlp-func-disk 2019-03-18 18:08:25.000000000 +0100 +++ new/TLP-1.2.2/func.d/15-tlp-func-disk 2019-05-04 19:49:18.000000000 +0200 @@ -32,7 +32,7 @@ get_disk_dev () { # translate disk id to device (sdX) # $1: id or dev; # retval: $_disk_dev, $_disk_id, $_disk_type - local path + local bus path if [ -h /dev/disk/by-id/$1 ]; then # $1 is disk id @@ -48,15 +48,22 @@ # determine device type (bus) if [ -b /dev/$_disk_dev ]; then - path="$($UDEVADM info -n "$_disk_dev" -q property 2>/dev/null | sed -n 's/^ID_PATH=//p')" + path="$($UDEVADM info -q property /dev/$_disk_dev 2>/dev/null | sed -n 's/^ID_PATH=//p')" + bus="$($UDEVADM info -q property /dev/$_disk_dev 2>/dev/null | sed -n 's/^ID_BUS=//p')" case "$path" in pci-*-nvme-*) _disk_type="nvme" ;; pci-*-ata-*) _disk_type="ata" ;; pci-*-usb-*) _disk_type="usb" ;; pci-*-ieee1394-*) _disk_type="ieee1394" ;; - *) _disk_type="unknown" ;; + *) case "$bus" in + nvme) _disk_type="nvme" ;; + ata) _disk_type="ata" ;; + usb) _disk_type="usb" ;; + ieee1394) _disk_type="ieee1394" ;; + *) _disk_type="unknown" ;; + esac esac - echo_debug "disk" "get_disk_dev($1): dev=$_disk_dev; type=$_disk_type; path=$path" + echo_debug "disk" "get_disk_dev($1): dev=$_disk_dev; type=$_disk_type; path=$path; bus=$bus" else _disk_type="none" echo_debug "disk" "get_disk_dev($1).missing" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TLP-1.2.1/func.d/30-tlp-func-rf-sw new/TLP-1.2.2/func.d/30-tlp-func-rf-sw --- old/TLP-1.2.1/func.d/30-tlp-func-rf-sw 2019-03-18 18:08:25.000000000 +0100 +++ new/TLP-1.2.2/func.d/30-tlp-func-rf-sw 2019-05-04 19:49:18.000000000 +0200 @@ -22,6 +22,8 @@ readonly RDW_LOCKTIME=2 readonly RDW_KILL="rdw_kill" +readonly RFSTATEFILE=$VARDIR/rfkill_saved + readonly DEFAULT_RESTORE_DEVICE_STATE_ON_STARTUP=0 # ---------------------------------------------------------------------------- @@ -118,7 +120,6 @@ } check_nm () { # test if NetworkManager is running and nmcli is installed - cmd_exists $NMCLI } @@ -332,28 +333,31 @@ # shellcheck disable=SC2120 save_device_states () { # save radio states -- $1: list of rftypes + # rc: 0=ok/1=create failed/2=write failed local dev local devlist="${1:-$ALLDEV}" # when arg empty -> use all - - echo_debug "rf" "save_device_states($devlist): $RFSTATEFILE" + local rc=0 # create empty state file - create_rundir - { : > $RFSTATEFILE; } 2> /dev/null - - # iterate over all possible devices -> save state in file - for dev in $devlist; do - device_state $dev - { printf '%s\n' "$dev $_devs" >> $RFSTATEFILE; } 2> /dev/null - done + if { : > $RFSTATEFILE; } 2> /dev/null; then + # iterate over all possible devices -> save state in file + for dev in $devlist; do + device_state $dev + { printf '%s\n' "$dev $_devs" >> $RFSTATEFILE; } 2> /dev/null || rc=2 + done + else + # create failed + rc=1 + fi - return 0 + echo_debug "rf" "save_device_states($devlist): $RFSTATEFILE; rc=$rc" + return $rc } restore_device_states () { # restore radio type states + # rc: 0=ok/1=state file nonexistent local sline - - echo_debug "rf" "restore_device_states: $RFSTATEFILE" + local rc=0 if [ -f $RFSTATEFILE ]; then # read state file @@ -362,11 +366,13 @@ set -- $sline # read dev, state into $1, $2 device_switch $1 $2 done < $RFSTATEFILE - - return 0 else - return 1 + # state file nonexistent + rc=1 fi + + echo_debug "rf" "restore_device_states: $RFSTATEFILE; rc=$rc" + return $rc } set_radio_device_states () { # set/initialize all radio states diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TLP-1.2.1/func.d/35-tlp-func-batt new/TLP-1.2.2/func.d/35-tlp-func-batt --- old/TLP-1.2.1/func.d/35-tlp-func-batt 2019-03-18 18:08:25.000000000 +0100 +++ new/TLP-1.2.2/func.d/35-tlp-func-batt 2019-05-04 19:49:18.000000000 +0200 @@ -192,9 +192,9 @@ # --- Battery Detection battery_present () { # check battery presence and return tpacpi-bat index - # $1: BAT0/BAT1/DEF + # $1: BAT0/BAT1/DEF/other # global param: $_bm_read - # rc: 0=bat exists/1=bat nonexistent/255=no method available + # rc: 0=bat exists/1=bat nonexistent # retval: $_bat_str: BAT0/BAT1; # $_bat_idx: 1/2; # $_bd_read: directory with battery data sysfiles; @@ -203,7 +203,7 @@ # $_bf_dischg: sysfile for force discharge # defaults - local rc=255 # no threshold API available + local rc=1 # bat nonexistent _bat_idx=0 # no index _bat_str="" # no bat _bd_read="" # no directories @@ -218,14 +218,12 @@ # validate param case $1 in - BAT0|BAT1) blist="$1" ;; - DEF) blist="BAT0 BAT1" ;; - *) return 1 ;; + DEF) blist="BAT0 BAT1" ;; + *) blist="$1" ;; esac case $_bm_read in natacpi) # note: includes tpacpi - rc=1 for bs in $blist; do bsd="$ACPIBATDIR/$bs" @@ -250,6 +248,11 @@ _bat_idx=1 # BAT0 nonexistent --> BAT1 is main fi ;; + + *) # non-featured battery --> data read only + _bat_str="$bs" + _bd_read="$bsd" + ;; esac break # exit loop on first battery detected fi @@ -295,7 +298,6 @@ case $rc in 0) echo_debug "bat" "battery_present($1): bm_read=$_bm_read; bat_str=$_bat_str; bat_idx=$_bat_idx; bd_read=$_bd_read; bf_start=$_bf_start; bf_stop=$_bf_stop; bf_dischg=$_bf_dischg; rc=$rc" ;; 1) echo_debug "bat" "battery_present($1).not_detected: bm_read=$_bm_read; rc=$rc" ;; - 255) echo_debug "bat" "battery_present($1).no_api" ;; esac return $rc @@ -597,6 +599,13 @@ battery_present $bat case $? in 0) # battery present + if [ "$_bm_thresh" = "none" ]; then + # no method available --> quit + echo "Error: battery charge thresholds not available." 1>&2 + echo_debug "bat" "setcharge_battery.no_method" + return 1 + fi + # get configured values if requested if [ $use_cfg -eq 1 ]; then eval start_thresh="\$START_CHARGE_THRESH_${_bat_str}" @@ -604,12 +613,6 @@ fi ;; - 255) # no method - echo "Error: battery feature not available." 1>&2 - echo_debug "bat" "setcharge_battery.no_method" - return 1 - ;; - *) # not present echo "Error: battery $bat not present." 1>&2 echo_debug "bat" "setcharge_battery.not_present($bat)" @@ -661,12 +664,13 @@ # check if selected battery is present battery_present $bat case $? in - 0) ;; # battery present - - 255) # no method - echo "Error: battery feature not available." 1>&2 - echo_debug "bat" "chargeonce_battery.no_method" - return 1 + 0) # battery present + if [ "$_bm_thresh" = "none" ]; then + # no method available --> quit + echo "Error: battery charge thresholds not available." 1>&2 + echo_debug "bat" "chargeonce_battery.no_method" + return 1 + fi ;; *) # not present @@ -859,12 +863,13 @@ # check if selected battery is present battery_present $bat case $? in - 0) ;; # battery present - - 255) # no method - echo "Error: battery feature not available." 1>&2 - echo_debug "bat" "discharge_battery.no_method" - return 1 + 0) # battery present + if [ "$_bm_dischg" = "none" ]; then + # no method available --> quit + echo "Error: battery discharge/recalibrate not available." 1>&2 + echo_debug "bat" "discharge_battery.no_method" + return 1 + fi ;; *) # not present @@ -877,16 +882,22 @@ # start discharge set_force_discharge $_bat_str 1; rc=$? if [ $rc -ne 0 ]; then - echo_debug "bat" "discharge_battery.force_discharge_not_available($_bat_str)" - echo "Error: discharge function not available for this laptop." 1>&2 + echo_debug "bat" "discharge_battery.force_discharge_malfunction($_bat_str)" + echo "Error: discharge malfunction." 1>&2 return 1 fi trap cancel_force_discharge INT # enable ^C hook - # wait for start == while status not "discharging" -- 5.0 sec timeout - wt=10 - while ! battery_discharging $_bat_str && [ $wt -gt 0 ] ; do sleep 0.5; wt=$((wt - 1)); done + # wait for start == while status not "discharging" -- 15.0 sec timeout + printf "Initiating discharge of battery %s " $_bat_str + wt=15 + while ! battery_discharging $_bat_str && [ $wt -gt 0 ] ; do + sleep 1 + printf "." + wt=$((wt - 1)) + done + printf "\n" if battery_discharging $_bat_str; then # discharge initiated sucessfully --> wait for completion == while status "discharging" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TLP-1.2.1/func.d/40-tlp-func-bay new/TLP-1.2.2/func.d/40-tlp-func-bay --- old/TLP-1.2.1/func.d/40-tlp-func-bay 2019-03-18 18:08:25.000000000 +0100 +++ new/TLP-1.2.2/func.d/40-tlp-func-bay 2019-05-04 19:49:18.000000000 +0200 @@ -13,7 +13,6 @@ readonly DOCKGLOB="/sys/devices/platform/dock.?" -readonly RFSTATEFILE=$RUNDIR/rfkill_saved readonly BAYSTATEFILE=$RUNDIR/bay_saved readonly DEFAULT_BAY_POWEROFF_ON_AC=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TLP-1.2.1/func.d/tlp-func-stat new/TLP-1.2.2/func.d/tlp-func-stat --- old/TLP-1.2.1/func.d/tlp-func-stat 2019-03-18 18:08:25.000000000 +0100 +++ new/TLP-1.2.2/func.d/tlp-func-stat 2019-05-04 19:49:18.000000000 +0200 @@ -207,8 +207,8 @@ if [ -z "$model" ]; then # hdparm -I not supported --> try udevadm approach - vendor="$($UDEVADM info -n /dev/$1 -q property 2>/dev/null | sed -n 's/^ID_VENDOR=//p')" - model="$( $UDEVADM info -n /dev/$1 -q property 2>/dev/null | sed -n 's/^ID_MODEL=//p' )" + vendor="$($UDEVADM info -q property /dev/$1 2>/dev/null | sed -n 's/^ID_VENDOR=//p')" + model="$( $UDEVADM info -q property /dev/$1 2>/dev/null | sed -n 's/^ID_MODEL=//p' )" model=$(printf "%s %s" "$vendor" "$model" | sed -r 's/_/ /g; s/-//g; s/[[:space:]]+$//') fi @@ -467,7 +467,7 @@ case $bm in _bm_read) m="data" ;; _bm_thresh) m="thresholds" ;; - _bm_dischg) m="discharge" ;; + _bm_dischg) m="recalibrate" ;; esac # concat method to output if [ -n "$mlist" ]; then @@ -527,6 +527,8 @@ # global param: $_bm_thresh, $_bat_idx, $_bf_start, $_bf_stop local bsys sp thresh + [ "$_bm_thresh" != "none" ] || return 0 # no method available --> quit + for sp in start stop; do get_threshold $sp; thresh=$? @@ -572,6 +574,8 @@ # global param: $_bm_dischg, $_bat_idx, $_bf_dischg local force + [ "$_bm_dischg" != "none" ] || return 0 # no method available --> quit + get_force_discharge $1; force=$? if [ $force -lt 2 ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TLP-1.2.1/man/tlp.8 new/TLP-1.2.2/man/tlp.8 --- old/TLP-1.2.1/man/tlp.8 2019-03-18 18:08:25.000000000 +0100 +++ new/TLP-1.2.2/man/tlp.8 2019-05-04 19:49:18.000000000 +0200 @@ -71,10 +71,6 @@ battery and recharge to 100%. . .TP -.B stat -Same as tlp\-stat. -. -.TP .B diskid Show disk ids for configuration. . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TLP-1.2.1/tlp-func-base.in new/TLP-1.2.2/tlp-func-base.in --- old/TLP-1.2.1/tlp-func-base.in 2019-03-18 18:08:25.000000000 +0100 +++ new/TLP-1.2.2/tlp-func-base.in 2019-05-04 19:49:18.000000000 +0200 @@ -9,10 +9,11 @@ # ---------------------------------------------------------------------------- # Constants -readonly TLPVER="1.2.1" +readonly TLPVER="1.2.2" readonly CONFFILE=@TLP_CONF@ readonly RUNDIR=@TLP_RUN@ +readonly VARDIR=@TLP_VAR@ readonly FLOCK=flock readonly HDPARM=hdparm @@ -476,6 +477,9 @@ # it's a real ThinkPad --> save model substring _tpmodel=$(echo $pv | sed -r 's/^Think[Pp]ad //') fi + else + # not a ThinkPad: get DMI product string + pv="$(read_dmi product_version)" fi if [ -n "$_tpmodel" ]; then @@ -514,11 +518,10 @@ # +------------ +------+------+------+ # battery | none | 2 | 0 | 1 | # status: | discharging | 1 | 0 | 1 | - # | idle | 0 | 0 | 1 | - # - # Note: existing AC online status has precendence over any battery status + # | idle | 0 | 0 | 0 | local psrc + local ac0seen= _syspwr= for psrc in /sys/class/power_supply/*; do @@ -531,26 +534,29 @@ Mains|USB) # AC detected # skip device to simulate broken AC detection - [ "$X_SIMULATE_AC_QUIRK" = "1" ] && continue + [ "$X_SIMULATE_AC_QUIRK" = "2" ] && continue # check if online if [ "$(read_sysf $psrc/online)" = "1" ]; then - # AC online + # AC online --> end iteration _syspwr=0 echo_debug "ps" "get_sys_power_supply(${psrc##/*/}).ac_online: syspwr=$_syspwr" + break else - # AC offline means battery - _syspwr=1 - echo_debug "ps" "get_sys_power_supply(${psrc##/*/}).ac_offline: syspwr=$_syspwr" + # AC offline could mean battery, but quirky hardware exists + # --> just remember and continue to look for batteries + ac0seen=$psrc fi - break # AC found --> end search ;; Battery) # battery detected - # --> inspect unless discharging battery has been found beforehand + # --> inspect unless a discharging battery has been found beforehand [ "$_syspwr" = "1" ] && continue + # skip device to simulate broken battery detection + [ "$X_SIMULATE_BAT_QUIRK" = "2" ] && continue + case "$(read_sysf $psrc/status)" in Discharging) if ! lockpeek_tlp tlp_discharge; then @@ -587,10 +593,17 @@ esac done - # set _syspwr to unknown if we haven't seen any AC/battery power source so far if [ -z "$_syspwr" ]; then - _syspwr=2 - echo_debug "ps" "get_sys_power_supply.unknown: syspwr=$_syspwr" + # _syspwr result yet undecided + if [ -n "$ac0seen" ]; then + # no battery seen but AC offline remembered --> battery + _syspwr=1 + echo_debug "ps" "get_sys_power_supply(${ac0seen##/*/}).ac_offline: syspwr=$_syspwr" + else + # we haven't seen any AC/battery power source --> unknown + _syspwr=2 + echo_debug "ps" "get_sys_power_supply.unknown: syspwr=$_syspwr" + fi fi return $_syspwr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TLP-1.2.1/tlp-stat.in new/TLP-1.2.2/tlp-stat.in --- old/TLP-1.2.1/tlp-stat.in 2019-03-18 18:08:25.000000000 +0100 +++ new/TLP-1.2.2/tlp-stat.in 2019-05-04 19:49:18.000000000 +0200 @@ -381,7 +381,7 @@ elif [ -f $CPU_BOOST_ALL_CTRL ]; then # show turbo boost info - get_sysval $CPU_BOOST_ALL_CTRL; boost=$? + boost=$(read_sysval $CPU_BOOST_ALL_CTRL) # simple test for attribute "w" doesn't work, so actually write if write_sysf "$boost" $CPU_BOOST_ALL_CTRL; then @@ -403,27 +403,32 @@ # --- show x86 energy perf policy info if cmd_exists $ENERGYPERF; then # check CPU support - $ENERGYPERF -r > /dev/null 2>&1 + eperf=$($ENERGYPERF -r 2> /dev/null) case $? in - 0) # parse x86_energy_perf_policy output: - # - replace numbers with descriptive strings - # - remove ":" - # - indent and align - $ENERGYPERF -r 2>/dev/null | grep -v 'HWP_' | \ - sed -r 's/://; - s/(0x0000000000000000|EPB 0)/performance/; - s/(0x0000000000000004|EPB 4)/balance-performance/; - s/(0x0000000000000006|EPB 6)/default/; - s/(0x0000000000000008|EPB 8)/balance-power/; - s/(0x000000000000000f|EPB 15)/power/' | \ - awk '{ printf "x86_energy_perf_policy.%-31s = %s %s\n", $1, $2, $3; }' + 0) if [ -n "$eperf" ]; then + # parse x86_energy_perf_policy output: + # - replace numbers with descriptive strings + # - remove ":" + # - indent and align + $ENERGYPERF -r 2>/dev/null | grep -v 'HWP_' | \ + sed -r 's/://; + s/(0x0000000000000000|EPB 0)/performance/; + s/(0x0000000000000004|EPB 4)/balance-performance/; + s/(0x0000000000000006|EPB 6)/default/; + s/(0x0000000000000008|EPB 8)/balance-power/; + s/(0x000000000000000f|EPB 15)/power/' | \ + awk '{ printf "x86_energy_perf_policy.%-31s = %s %s\n", $1, $2, $3; }' + printf "\n" + else + # newer versions produce zero output for unsupported CPUs + printf "x86_energy_perf_policy: unsupported CPU.\n\n" + fi ;; - 1) echo "x86_energy_perf_policy: unsupported CPU." ;; - 2) echo "x86_energy_perf_policy: program for your kernel not installed." ;; - *) echo "x86_energy_perf_policy: not available." ;; + 1) printf "x86_energy_perf_policy: unsupported CPU.\n\n" ;; + 2) printf "x86_energy_perf_policy: program for your kernel not installed.\n\n" ;; + *) printf "x86_energy_perf_policy: not available.\n\n" ;; esac - echo else echo "x86_energy_perf_policy: program not installed." echo @@ -808,7 +813,7 @@ ensum=0 # --- show availability of (ThinkPad) battery features - echo "+++ Battery Features" + echo "+++ Battery Features: Charge Thresholds and Recalibrate" # native ACPI kernel battery API case $_natacpi in @@ -864,8 +869,8 @@ 0) echo "+++ ThinkPad Battery Status: $batt" ;; esac else - # laptop or ThinkPad without feature support - echo "+++ Battery Status" + # non-featured ThinkPad or other laptop make + echo "+++ Battery Status: $batt" fi case $_bm_read in @@ -989,7 +994,7 @@ if [ $bcnt -eq 0 ]; then # no battery detected printf "+++ Battery Status\n" - printf "No batteries detected.\n\n" + printf "No battery data available.\n\n" elif [ $bcnt -gt 1 ] && [ $efsum -ne 0 ]; then # more than one battery detected --> show charge total perl -e 'printf ("%-59s = %6.1f [%%]\n", "+++ Charge total", 100.0 * '$ensum' / '$efsum');' @@ -1028,8 +1033,13 @@ if is_thinkpad; then # add ThinkPad specific recommendations - [ $_tpsmapi -eq 128 ] \ - && reout="${reout}Install tp-smapi kernel modules for ThinkPad battery thresholds and recalibration\n" + if [ $_tpsmapi -eq 128 ]; then + if supports_tpsmapi_and_tpacpi; then + reout="${reout}Install tp-smapi kernel modules for extended battery info (e.g. the cycle count)\n" + else + reout="${reout}Install tp-smapi kernel modules for ThinkPad battery thresholds and recalibration\n" + fi + fi case $_tpacpi in 127) missing="tpacpi-bat program" ;; 128) missing="acpi_call kernel module" ;; @@ -1053,6 +1063,7 @@ if [ -n "$reout" ]; then echo "+++ Recommendations" # shellcheck disable=SC2059 + # don't change to %s, $reout contains blanks and \n! printf "$reout" | sed -r 's/^/\* /' echo fi @@ -1086,7 +1097,13 @@ jdone=0 if cmd_exists $JOURNALCTL; then # retrieve trace output from journal, rc=1 if journald has no data available - $JOURNALCTL -p debug --no-pager SYSLOG_IDENTIFIER=tlp 2> /dev/null && jdone=1 + if [ $show_verbose -eq 1 ]; then + # verbose: show all output + $JOURNALCTL -p debug --no-pager SYSLOG_IDENTIFIER=tlp 2> /dev/null && jdone=1 + else + # non-verbose: show output since last reboot only + $JOURNALCTL -p debug --no-pager SYSLOG_IDENTIFIER=tlp -b 2> /dev/null && jdone=1 + fi fi if [ "$jdone" = "0" ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/TLP-1.2.1/tlp.bash_completion new/TLP-1.2.2/tlp.bash_completion --- old/TLP-1.2.1/tlp.bash_completion 2019-03-18 18:08:25.000000000 +0100 +++ new/TLP-1.2.2/tlp.bash_completion 2019-05-04 19:49:18.000000000 +0200 @@ -5,8 +5,9 @@ local bats b bats=$( { - for b in /sys/class/power_supply/BAT*; do - if [ $(cat $b/present 2> /dev/null) = "1" ]; then + for b in /sys/class/power_supply/*; do + if [ "$(cat $b/present 2> /dev/null)" = "1" ] \ + && [ "$(cat $b/type)" = "Battery" ]; then echo "${b##/*/} " fi done } ) @@ -67,8 +68,8 @@ local cur prev words cword opts _init_completion || return - opts="--battery --config --disk --pcie --pev --psup --processor --rfkill - --system --temp --usb --warn --trace --verbose" + opts="--battery --config --disk --graphics --pcie --pev --psup --processor + --rfkill --system --temp --usb --warn --trace --verbose" if [ $cword -eq 1 ]; then COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )

1 0

commit openQA for openSUSE:Factory
by root 24 May '19

24 May '19

Hello community, here is the log from the commit of package openQA for openSUSE:Factory checked in at 2019-05-24 11:30:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openQA (Old) and /work/SRC/openSUSE:Factory/.openQA.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openQA" Fri May 24 11:30:38 2019 rev:67 rq:704781 version:4.6.1558532409.ab91f319 Changes: -------- --- /work/SRC/openSUSE:Factory/openQA/openQA-test.changes 2019-05-21 10:38:29.675160736 +0200 +++ /work/SRC/openSUSE:Factory/.openQA.new.5148/openQA-test.changes 2019-05-24 11:30:42.245416990 +0200 @@ -1,0 +2,12 @@ +Wed May 22 14:34:05 UTC 2019 - coolo(a)suse.com + +- Update to version 4.6.1558532409.ab91f319: + * Install qemu-uefi-aarch64 on aarch64 in bootstrap + * Use less noisy perl style for $comment->label + * Prevent accessing comment label without check for undef + * Ensure that module names are escaped + * List remaining failed modules on mouseover + * Allow listing bugs by the time of reporting + * Require YAML::XS >= 0.67 + +------------------------------------------------------------------- openQA.changes: same change Old: ---- openQA-4.6.1558084113.18c6f052.obscpio New: ---- openQA-4.6.1558532409.ab91f319.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openQA-test.spec ++++++ --- /var/tmp/diff_new_pack.Zt7qci/_old 2019-05-24 11:30:43.169416752 +0200 +++ /var/tmp/diff_new_pack.Zt7qci/_new 2019-05-24 11:30:43.173416751 +0200 @@ -18,7 +18,7 @@ %define short_name openQA Name: %{short_name}-test -Version: 4.6.1558084113.18c6f052 +Version: 4.6.1558532409.ab91f319 Release: 0 Summary: Test package for openQA License: GPL-2.0-or-later ++++++ openQA.spec ++++++ --- /var/tmp/diff_new_pack.Zt7qci/_old 2019-05-24 11:30:43.213416741 +0200 +++ /var/tmp/diff_new_pack.Zt7qci/_new 2019-05-24 11:30:43.225416737 +0200 @@ -36,7 +36,7 @@ # runtime requirements that also the testsuite needs %define t_requires perl(DBD::Pg) perl(DBIx::Class) perl(Config::IniFiles) perl(SQL::Translator) perl(Date::Format) perl(File::Copy::Recursive) perl(DateTime::Format::Pg) perl(Net::OpenID::Consumer) perl(Mojolicious::Plugin::RenderFile) perl(Mojolicious::Plugin::AssetPack) perl(aliased) perl(Config::Tiny) perl(DBIx::Class::DynamicDefault) perl(DBIx::Class::Schema::Config) perl(DBIx::Class::Storage::Statistics) perl(IO::Socket::SSL) perl(Data::Dump) perl(DBIx::Class::OptimisticLocking) perl(Text::Markdown) perl(Net::DBus) perl(JSON::Validator) perl(YAML::XS) perl(IPC::Run) perl(Archive::Extract) perl(CSS::Minifier::XS) perl(JavaScript::Minifier::XS) perl(Time::ParseDate) perl(Sort::Versions) perl(Mojo::RabbitMQ::Client) perl(BSD::Resource) perl(Cpanel::JSON::XS) perl(Pod::POM) perl(Mojo::IOLoop::ReadWriteProcess) perl(Minion) perl(Mojo::Pg) perl(Mojo::SQLite) perl(Minion::Backend::SQLite) Name: openQA -Version: 4.6.1558084113.18c6f052 +Version: 4.6.1558532409.ab91f319 Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later @@ -62,6 +62,7 @@ Requires: dbus-1 Requires: perl(Minion) >= 9.09 Requires: perl(Mojo::RabbitMQ::Client) >= 0.2 +Requires: perl(YAML::XS) >= 0.67 # needed for test suite Requires: git-core Requires: openQA-client = %{version} ++++++ Dockerfile ++++++ --- /var/tmp/diff_new_pack.Zt7qci/_old 2019-05-24 11:30:43.285416722 +0200 +++ /var/tmp/diff_new_pack.Zt7qci/_new 2019-05-24 11:30:43.285416722 +0200 @@ -92,7 +92,7 @@ 'perl(Mojolicious::Plugin::AssetPack)' \ 'perl(Mojolicious::Plugin::RenderFile)' \ 'perl(JSON::Validator)' \ - 'perl(YAML::XS)' \ + 'perl(YAML::XS) >= 0.67' \ 'perl(Net::DBus)' \ 'perl(Net::OpenID::Consumer)' \ 'perl(Net::SNMP)' \ ++++++ openQA-4.6.1558084113.18c6f052.obscpio -> openQA-4.6.1558532409.ab91f319.obscpio ++++++ /work/SRC/openSUSE:Factory/openQA/openQA-4.6.1558084113.18c6f052.obscpio /work/SRC/openSUSE:Factory/.openQA.new.5148/openQA-4.6.1558532409.ab91f319.obscpio differ: char 49, line 1 ++++++ openQA.obsinfo ++++++ --- /var/tmp/diff_new_pack.Zt7qci/_old 2019-05-24 11:30:43.385416697 +0200 +++ /var/tmp/diff_new_pack.Zt7qci/_new 2019-05-24 11:30:43.389416695 +0200 @@ -1,5 +1,5 @@ name: openQA -version: 4.6.1558084113.18c6f052 -mtime: 1558084113 -commit: 18c6f052526a4753172bd7564c074db368da2128 +version: 4.6.1558532409.ab91f319 +mtime: 1558532409 +commit: ab91f319b2e395242078b4c5d2bd85e915c5a626

1 0

commit os-autoinst for openSUSE:Factory
by root 24 May '19

24 May '19

Hello community, here is the log from the commit of package os-autoinst for openSUSE:Factory checked in at 2019-05-24 11:30:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-autoinst (Old) and /work/SRC/openSUSE:Factory/.os-autoinst.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "os-autoinst" Fri May 24 11:30:32 2019 rev:60 rq:704780 version:4.5.1558432600.6c62e09d Changes: -------- --- /work/SRC/openSUSE:Factory/os-autoinst/os-autoinst-test.changes 2019-05-17 23:42:32.133933501 +0200 +++ /work/SRC/openSUSE:Factory/.os-autoinst.new.5148/os-autoinst-test.changes 2019-05-24 11:30:36.013418595 +0200 @@ -1,0 +2,6 @@ +Tue May 21 09:56:52 UTC 2019 - okurz(a)suse.com + +- Update to version 4.5.1558432600.6c62e09d: + * Don't modify backend vars when running test + +------------------------------------------------------------------- os-autoinst.changes: same change Old: ---- os-autoinst-4.5.1557827957.ce72694e.obscpio New: ---- os-autoinst-4.5.1558432600.6c62e09d.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-autoinst-test.spec ++++++ --- /var/tmp/diff_new_pack.GgDbW1/_old 2019-05-24 11:30:37.209418287 +0200 +++ /var/tmp/diff_new_pack.GgDbW1/_new 2019-05-24 11:30:37.213418286 +0200 @@ -19,7 +19,7 @@ %define name_ext -test %define short_name os-autoinst Name: %{short_name}%{?name_ext} -Version: 4.5.1557827957.ce72694e +Version: 4.5.1558432600.6c62e09d Release: 0 Summary: test package for os-autoinst License: GPL-2.0-or-later ++++++ os-autoinst.spec ++++++ --- /var/tmp/diff_new_pack.GgDbW1/_old 2019-05-24 11:30:37.253418276 +0200 +++ /var/tmp/diff_new_pack.GgDbW1/_new 2019-05-24 11:30:37.273418270 +0200 @@ -17,7 +17,7 @@ Name: os-autoinst -Version: 4.5.1557827957.ce72694e +Version: 4.5.1558432600.6c62e09d Release: 0 Summary: OS-level test automation License: GPL-2.0-or-later ++++++ os-autoinst-4.5.1557827957.ce72694e.obscpio -> os-autoinst-4.5.1558432600.6c62e09d.obscpio ++++++ /work/SRC/openSUSE:Factory/os-autoinst/os-autoinst-4.5.1557827957.ce72694e.obscpio /work/SRC/openSUSE:Factory/.os-autoinst.new.5148/os-autoinst-4.5.1558432600.6c62e09d.obscpio differ: char 49, line 1 ++++++ os-autoinst.obsinfo ++++++ --- /var/tmp/diff_new_pack.GgDbW1/_old 2019-05-24 11:30:37.389418240 +0200 +++ /var/tmp/diff_new_pack.GgDbW1/_new 2019-05-24 11:30:37.389418240 +0200 @@ -1,5 +1,5 @@ name: os-autoinst -version: 4.5.1557827957.ce72694e -mtime: 1557827957 -commit: ce72694e9743fa6841fe470f9505a7db76f880cf +version: 4.5.1558432600.6c62e09d +mtime: 1558432600 +commit: 6c62e09dfa463ac608dd6ef071b99f60c37dabfb

1 0

commit gnome-multi-writer for openSUSE:Factory
by root 24 May '19

24 May '19

Hello community, here is the log from the commit of package gnome-multi-writer for openSUSE:Factory checked in at 2019-05-24 11:30:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-multi-writer (Old) and /work/SRC/openSUSE:Factory/.gnome-multi-writer.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-multi-writer" Fri May 24 11:30:28 2019 rev:17 rq:704776 version:3.32.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-multi-writer/gnome-multi-writer.changes 2019-05-03 22:46:04.243720199 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-multi-writer.new.5148/gnome-multi-writer.changes 2019-05-24 11:30:30.885419916 +0200 @@ -1,0 +2,7 @@ +Wed May 22 13:15:11 UTC 2019 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- Update to version 3.32.1: + + This fixes a memory corruption issue causing the UI to crash + and also fixes some build issues. + +------------------------------------------------------------------- Old: ---- gnome-multi-writer-3.32.0.tar.xz New: ---- gnome-multi-writer-3.32.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-multi-writer.spec ++++++ --- /var/tmp/diff_new_pack.aAkjbl/_old 2019-05-24 11:30:31.721419700 +0200 +++ /var/tmp/diff_new_pack.aAkjbl/_new 2019-05-24 11:30:31.725419699 +0200 @@ -17,14 +17,13 @@ Name: gnome-multi-writer -Version: 3.32.0 +Version: 3.32.1 Release: 0 Summary: Program for writing an ISO file to multiple USB devices at once License: GPL-2.0-or-later Group: System/GUI/GNOME URL: https://wiki.gnome.org/Apps/MultiWriter Source0: https://download.gnome.org/sources/gnome-multi-writer/3.32/%{name}-%{versio… - BuildRequires: docbook-utils-minimal BuildRequires: gobject-introspection-devel >= 0.9.8 BuildRequires: hicolor-icon-theme ++++++ gnome-multi-writer-3.32.0.tar.xz -> gnome-multi-writer-3.32.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-multi-writer-3.32.0/RELEASE new/gnome-multi-writer-3.32.1/RELEASE --- old/gnome-multi-writer-3.32.0/RELEASE 2019-03-08 13:14:45.000000000 +0100 +++ new/gnome-multi-writer-3.32.1/RELEASE 2019-05-22 15:07:11.000000000 +0200 @@ -2,13 +2,13 @@ * Write NEWS entries in the same format as usual. -git log --format="%s" GNOME_MULTI_WRITER_3_30_0.. | grep -i -v trivial | grep -v Merge | uniq +git log --format="%s" GNOME_MULTI_WRITER_3_32_0.. | grep -i -v trivial | grep -v Merge | uniq Add any user visible changes into ../data/appdata/org.gnome.MultiWriter.appdata.xml.in * Commit changes in git: -git commit -a -m "Release version 3.32.0" -git tag -s GNOME_MULTI_WRITER_3_32_0 -m "==== Version 3.32.0 ====" +git commit -a -m "Release version 3.32.1" +git tag -s GNOME_MULTI_WRITER_3_32_1 -m "==== Version 3.32.1 ====" ninja dist git push --tags git push diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-multi-writer-3.32.0/data/appdata/org.gnome.MultiWriter.appdata.xml.in new/gnome-multi-writer-3.32.1/data/appdata/org.gnome.MultiWriter.appdata.xml.in --- old/gnome-multi-writer-3.32.0/data/appdata/org.gnome.MultiWriter.appdata.xml.in 2019-03-08 13:14:45.000000000 +0100 +++ new/gnome-multi-writer-3.32.1/data/appdata/org.gnome.MultiWriter.appdata.xml.in 2019-05-22 15:07:11.000000000 +0200 @@ -61,6 +61,14 @@ Validate with `appstream-util validate *.appdata.xml` --> <releases> + <release date="2019-05-22" version="3.32.1"> + <description> + <p> + This fixes a memory corruption issue causing the UI to crash and also + fixes some build issues. + </p> + </description> + </release> <release date="2019-03-08" version="3.32.0"> <description> <p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-multi-writer-3.32.0/meson.build new/gnome-multi-writer-3.32.1/meson.build --- old/gnome-multi-writer-3.32.0/meson.build 2019-03-08 13:14:45.000000000 +0100 +++ new/gnome-multi-writer-3.32.1/meson.build 2019-05-22 15:07:11.000000000 +0200 @@ -1,5 +1,5 @@ project('gnome-multi-writer', 'c', - version : '3.32.0', + version : '3.32.1', default_options : ['warning_level=1'], meson_version : '>=0.46.0' ) @@ -80,6 +80,7 @@ gtk = dependency('gtk+-3.0', version : '>= 3.11.2') gio = dependency('gio-2.0') +gio_unix = dependency('gio-unix-2.0') gusb = dependency('gusb', version : '>= 0.2.7') udisks = dependency('udisks2') gudev = dependency('gudev-1.0') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-multi-writer-3.32.0/po/fr.po new/gnome-multi-writer-3.32.1/po/fr.po --- old/gnome-multi-writer-3.32.0/po/fr.po 2019-03-08 13:14:45.000000000 +0100 +++ new/gnome-multi-writer-3.32.1/po/fr.po 2019-05-22 15:07:11.000000000 +0200 @@ -7,80 +7,62 @@ # geecko <geecko.dev(a)free.fr>, 2015 # Jérôme Fenal <jfenal(a)gmail.com>, 2015 # Guillaume Bernard <translate(a)filorin.fr>, 2015. +# Charles Monzat <charles.monzat(a)numericable.fr>, 2019. # msgid "" msgstr "" "Project-Id-Version: gnome-multi-writer\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"multi-writer&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-04-06 07:18+0000\n" -"PO-Revision-Date: 2015-09-20 22:35+0200\n" -"Last-Translator: Guillaume Bernard <translate(a)filorin.fr>\n" -"Language-Team: français <gnomefr(a)traduc.org>\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-multi-writer/" +"issues\n" +"POT-Creation-Date: 2018-09-04 18:36+0000\n" +"PO-Revision-Date: 2019-01-07 19:03+0100\n" +"Last-Translator: Charles Monzat <charles.monzat(a)numericable.fr>\n" +"Language-Team: GNOME French Team <gnomefr(a)traduc.org>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Gtranslator 2.91.6\n" +"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"X-Generator: Gtranslator 3.30.0\n" -#. TRANSLATORS: Application window title #. TRANSLATORS: the application name #. set the title -#: ../data/gmw-main.ui.h:2 -#: ../data/appdata/org.gnome.MultiWriter.appdata.xml.in.h:2 -#: ../data/org.gnome.MultiWriter.desktop.in.h:1 ../src/gmw-main.c:855 +#. TRANSLATORS: Application window title +#: data/appdata/org.gnome.MultiWriter.appdata.xml.in:8 +#: data/org.gnome.MultiWriter.desktop.in:3 src/gmw-main.c:795 +#: src/gmw-main.ui:98 msgid "MultiWriter" msgstr "MultiWriter" -#. TRANSLATORS: button to start the copy -#: ../data/gmw-main.ui.h:4 -msgid "Start Copying" -msgstr "Démarrer la copie" - -#. TRANSLATORS: app menu item for the file chooser -#: ../data/gmw-menus.ui.h:2 -msgid "Import ISO file…" -msgstr "Importer un fichier ISO..." - -#. TRANSLATORS: app menu item for the About UI -#: ../data/gmw-menus.ui.h:4 -msgid "_About" -msgstr "_À propos" - -#. TRANSLATORS: app menu item for Quit -#: ../data/gmw-menus.ui.h:6 -msgid "_Quit" -msgstr "_Quitter" - #. TRANSLATORS: one-line description for the app -#: ../data/appdata/org.gnome.MultiWriter.appdata.xml.in.h:4 -#: ../data/org.gnome.MultiWriter.desktop.in.h:2 ../src/gmw-main.c:1380 +#: data/appdata/org.gnome.MultiWriter.appdata.xml.in:10 +#: data/org.gnome.MultiWriter.desktop.in:4 src/gmw-main.c:1273 msgid "Write an ISO file to multiple USB devices at once" msgstr "Écrire un fichier ISO sur plusieurs périphériques USB à la fois" #. TRANSLATORS: AppData description marketing paragraph -#: ../data/appdata/org.gnome.MultiWriter.appdata.xml.in.h:6 +#: data/appdata/org.gnome.MultiWriter.appdata.xml.in:13 msgid "" "GNOME MultiWriter can be used to write an ISO file to multiple USB devices " "at once. Supported drive sizes are between 1GB and 32GB." msgstr "" "GNOME MultiWriter peut être utilisé pour écrire une image ISO sur plusieurs " -"supports en même temps. Les tailles de lecteur supportées vont de 1Go à 32Go." +"supports en même temps. Les tailles de lecteur supportées vont de 1 Go à " +"32 Go." #. TRANSLATORS: QA refers to quality assurance, aka people testing stuff, #. GNOME refers to the desktop environment -#: ../data/appdata/org.gnome.MultiWriter.appdata.xml.in.h:9 +#: data/appdata/org.gnome.MultiWriter.appdata.xml.in:20 msgid "" "MultiWriter may be useful for QA testing, to create a GNOME Live image for a " "code sprint or to create hundreds of LiveUSB drives for a trade show." msgstr "" -"MultiWriter peut être utile pour les tests d'assurance qualité, pour créer " +"MultiWriter peut être utile pour les tests d’assurance qualité, pour créer " "une image de GNOME pour un sprint de code ou créer des centaines de clés USB " "Live pour un salon ou un événement." #. TRANSLATORS: saturate as in the throughput can get no more -#: ../data/appdata/org.gnome.MultiWriter.appdata.xml.in.h:11 +#: data/appdata/org.gnome.MultiWriter.appdata.xml.in:26 msgid "" "Writing a more than 10 devices simultaneously can easy saturate the USB bus " "for most storage devices. There are two ways to write more devices in " @@ -88,21 +70,21 @@ msgstr "" "L’écriture simultanée sur plus de 10 périphériques peut facilement saturer " "le bus USB pour la plupart des périphériques de stockage. Il y a deux façons " -"d'écrire plusieurs périphériques en parallèle :" +"d’écrire plusieurs périphériques en parallèle :" #. TRANSLATORS: storage devices refers to the things we're writing to -#: ../data/appdata/org.gnome.MultiWriter.appdata.xml.in.h:13 +#: data/appdata/org.gnome.MultiWriter.appdata.xml.in:33 msgid "Use USB 3.0 hubs, even if the storage devices are USB 2.0" msgstr "" "Utiliser un port USB 3.0 même si les périphériques de stockage sont USB 2.0" #. TRANSLATORS: PCIe is the data bus, don't translate please -#: ../data/appdata/org.gnome.MultiWriter.appdata.xml.in.h:15 +#: data/appdata/org.gnome.MultiWriter.appdata.xml.in:35 msgid "Install another USB 2.0 PCIe root hub" msgstr "Installer une autre carte USB 2.0 PCIe" #. TRANSLATORS: the ColorHug is an open hardware product, don't translate the name -#: ../data/appdata/org.gnome.MultiWriter.appdata.xml.in.h:17 +#: data/appdata/org.gnome.MultiWriter.appdata.xml.in:38 msgid "" "MultiWriter was originally written as part of the ColorHug project but was " "split off as an independent application in 2015." @@ -111,74 +93,85 @@ "en une application indépendante en 2015." #. TRANSLATORS: the 1st screenshot caption -#: ../data/appdata/org.gnome.MultiWriter.appdata.xml.in.h:19 +#: data/appdata/org.gnome.MultiWriter.appdata.xml.in:47 msgid "Initial screen for the application" -msgstr "Écran d'accueil de l'application" +msgstr "Écran d’accueil de l’application" #. TRANSLATORS: the 2nd screenshot caption -#: ../data/appdata/org.gnome.MultiWriter.appdata.xml.in.h:21 +#: data/appdata/org.gnome.MultiWriter.appdata.xml.in:52 msgid "Writing and verifying images" msgstr "Écriture et vérification des images" #. TRANSLATORS: the 3rd screenshot caption -#: ../data/appdata/org.gnome.MultiWriter.appdata.xml.in.h:23 +#: data/appdata/org.gnome.MultiWriter.appdata.xml.in:57 msgid "All devices have been written" msgstr "Tous les périphériques ont été écrits" +#. TRANSLATORS: Do NOT translate or transliterate this text (this is an icon file name)! +#: data/org.gnome.MultiWriter.desktop.in:6 +#| msgid "MultiWriter" +msgid "org.gnome.MultiWriter" +msgstr "org.gnome.MultiWriter" + +#. TRANSLATORS: these are desktop keywords - remember the trailing ';' :) +#: data/org.gnome.MultiWriter.desktop.in:12 +msgid "Image;Writer;ISO;USB;" +msgstr "Image;Écriture;ISO;USB;" + #. TRANSLATORS: schema summary -#: ../data/org.gnome.MultiWriter.gschema.xml.h:2 +#: data/org.gnome.MultiWriter.gschema.xml:6 msgid "The filename to write to the USB disks" msgstr "Le nom du fichier à écrire sur les disques USB" #. TRANSLATORS: schema description -#: ../data/org.gnome.MultiWriter.gschema.xml.h:4 +#: data/org.gnome.MultiWriter.gschema.xml:8 msgid "The filename of the ISO image to write to the connected USB disks." msgstr "" -"Le nom de fichier de l'image ISO à écrire sur les disques USB connectés." +"Le nom de fichier de l’image ISO à écrire sur les disques USB connectés." #. TRANSLATORS: schema summary -#: ../data/org.gnome.MultiWriter.gschema.xml.h:6 +#: data/org.gnome.MultiWriter.gschema.xml:13 msgid "The maximum number of threads to use" -msgstr "Le nombre maximum fils d'exécution à utiliser" +msgstr "Le nombre maximum de fils d’exécution à utiliser" #. TRANSLATORS: schema description -#: ../data/org.gnome.MultiWriter.gschema.xml.h:8 +#: data/org.gnome.MultiWriter.gschema.xml:15 msgid "The maximum number of parallel threads to use when copying data." msgstr "" -"Le nombre maximum de fils d'exécution parallèles à utiliser lors de la copie " +"Le nombre maximum de fils d’exécution parallèles à utiliser lors de la copie " "de données." #. TRANSLATORS: schema summary -#: ../data/org.gnome.MultiWriter.gschema.xml.h:10 +#: data/org.gnome.MultiWriter.gschema.xml:20 msgid "Completely blank drive when writing" -msgstr "Effacer totalement le disque lors de l'écriture" +msgstr "Effacer totalement le disque lors de l’écriture" #. TRANSLATORS: schema description -#: ../data/org.gnome.MultiWriter.gschema.xml.h:12 +#: data/org.gnome.MultiWriter.gschema.xml:22 msgid "Write the ISO to the drive and then blank the remainder of the drive." msgstr "" -"Écrit l'image ISO sur le support et efface le reste de l'espace du disque." +"Écrit l’image ISO sur le support et efface le reste de l’espace du disque." #. TRANSLATORS: schema summary -#: ../data/org.gnome.MultiWriter.gschema.xml.h:14 +#: data/org.gnome.MultiWriter.gschema.xml:27 msgid "Verify the ISO image was written correctly" msgstr "Vérification des données écrites" #. TRANSLATORS: schema description -#: ../data/org.gnome.MultiWriter.gschema.xml.h:16 +#: data/org.gnome.MultiWriter.gschema.xml:29 msgid "" "Read and verify the ISO image from each device after writing is complete." msgstr "" "Lecture et vérification sur chacun des périphériques après écriture de " -"l'image ISO." +"l’image ISO." #. TRANSLATORS: schema summary -#: ../data/org.gnome.MultiWriter.gschema.xml.h:18 +#: data/org.gnome.MultiWriter.gschema.xml:34 msgid "Inspect the device before writing images" -msgstr "Inspecter le périphérique avant l'écriture des images" +msgstr "Inspecter le périphérique avant l’écriture des images" #. TRANSLATORS: schema description -#: ../data/org.gnome.MultiWriter.gschema.xml.h:20 +#: data/org.gnome.MultiWriter.gschema.xml:36 msgid "" "Inspect the device to verify the reported device size is the actual media " "size." @@ -187,164 +180,159 @@ "taille du média." #. TRANSLATORS: schema summary -#: ../data/org.gnome.MultiWriter.gschema.xml.h:22 +#: data/org.gnome.MultiWriter.gschema.xml:41 msgid "Show a warning before writing to a drive" msgstr "Montre une alerte avant écriture sur le support" #. TRANSLATORS: schema description -#: ../data/org.gnome.MultiWriter.gschema.xml.h:24 +#: data/org.gnome.MultiWriter.gschema.xml:43 msgid "" "Show a warning dialog confirming that the device contents are to be erased." msgstr "" -"Montre une fenêtre d'alerte confirmant l'effacement des données contenues " +"Montre une fenêtre d’alerte confirmant l’effacement des données contenues " "sur le support" -#. TRANSLATORS: these are desktop keywords - remember the trailing ';' :) -#: ../data/org.gnome.MultiWriter.desktop.in.h:4 -msgid "Image;Writer;ISO;USB;" -msgstr "Image;Écriture;ISO;USB;" - -#: ../data/org.gnome.MultiWriter.policy.in.h:1 +#: data/org.gnome.MultiWriter.policy.in:17 msgid "Check the device" msgstr "Vérifier le périphérique" -#: ../data/org.gnome.MultiWriter.policy.in.h:2 +#: data/org.gnome.MultiWriter.policy.in:18 msgid "Authentication is required to probe the device" msgstr "Authentification nécessaire pour sonder le périphérique" #. TRANSLATORS: The image has been written and verified to #. * *one* device, not all -#: ../src/gmw-device.c:294 +#: src/gmw-device.c:243 msgid "Written successfully" msgstr "Écriture réussie" #. TRANSLATORS: we're writing the image to the device #. * and we now know the speed -#: ../src/gmw-device.c:302 +#: src/gmw-device.c:251 #, c-format msgid "Writing at %.1f MB/s…" -msgstr "Écriture à %.1f Mio/s…" +msgstr "Écriture à %.1f Mio/s…" #. TRANSLATORS: we're writing the image to the USB device -#: ../src/gmw-device.c:306 +#: src/gmw-device.c:255 msgid "Writing…" msgstr "Écriture des données…" #. TRANSLATORS: We're verifying the USB device contains #. * the correct image data and we now know the speed -#: ../src/gmw-device.c:315 +#: src/gmw-device.c:264 #, c-format msgid "Verifying at %.1f MB/s…" -msgstr "Vérification à %.1f Mio/s…" +msgstr "Vérification à %.1f Mio/s…" #. TRANSLATORS: We're verifying the USB device contains #. * the correct image data -#: ../src/gmw-device.c:320 +#: src/gmw-device.c:269 msgid "Verifying…" msgstr "Vérification des données…" #. TRANSLATORS: This is a generic no-name USB flash disk -#: ../src/gmw-device.c:396 +#: src/gmw-device.c:331 msgid "USB Flash Drive" msgstr "Disque flash USB" #. TRANSLATORS: window title renaming labels -#: ../src/gmw-main.c:317 +#: src/gmw-main.c:281 msgid "New hub label" msgstr "Nouvelle étiquette du concentrateur" #. TRANSLATORS: the application name #. TRANSLATORS: the application name for the about UI #. TRANSLATORS: A program to copy the LiveUSB image onto USB hardware -#: ../src/gmw-main.c:487 ../src/gmw-main.c:1377 ../src/gmw-main.c:1833 +#: src/gmw-main.c:439 src/gmw-main.c:1270 src/gmw-main.c:1684 msgid "GNOME MultiWriter" msgstr "GNOME MultiWriter" #. TRANSLATORS: the success sound description -#: ../src/gmw-main.c:489 +#: src/gmw-main.c:441 msgid "Image written successfully" msgstr "Image écrite avec succès" #. TRANSLATORS: copy aborted -#: ../src/gmw-main.c:598 ../src/gmw-main.c:638 ../src/gmw-main.c:744 -#: ../src/gmw-main.c:779 +#: src/gmw-main.c:544 src/gmw-main.c:584 src/gmw-main.c:687 src/gmw-main.c:722 msgid "Cancelled" msgstr "Annulée" #. TRANSLATORS: we couldn't open the ISO file the user chose -#: ../src/gmw-main.c:1020 ../src/gmw-main.c:1034 +#: src/gmw-main.c:942 src/gmw-main.c:956 msgid "Failed to open" -msgstr "Impossible d'ouvrir" +msgstr "Impossible d’ouvrir" #. TRANSLATORS: window title for the file-chooser, file is an ISO -#: ../src/gmw-main.c:1054 +#: src/gmw-main.c:973 msgid "Choose the file to write" msgstr "Choisir le fichier à écrire" #. TRANSLATORS: button title -#: ../src/gmw-main.c:1058 +#. TRANSLATORS: button to cancel a copy process +#: src/gmw-main.c:977 src/gmw-main.ui:115 msgid "Cancel" msgstr "Annuler" #. TRANSLATORS: button title -#: ../src/gmw-main.c:1060 +#: src/gmw-main.c:979 msgid "Import" msgstr "Importer" #. TRANSLATORS: the file filter description, e.g. *.iso -#: ../src/gmw-main.c:1064 +#: src/gmw-main.c:983 msgid "ISO files" msgstr "Fichiers ISO" #. TRANSLATORS: error dialog title: #. * we probably didn't authenticate -#: ../src/gmw-main.c:1231 ../src/gmw-main.c:1244 +#: src/gmw-main.c:1131 src/gmw-main.c:1150 msgid "Failed to copy" msgstr "Impossible de copier" #. TRANSLATORS: the inhibit reason -#: ../src/gmw-main.c:1262 +#: src/gmw-main.c:1167 msgid "Writing ISO to devices" -msgstr "Écriture de l'ISO sur les disques" +msgstr "Écriture de l’ISO sur les disques" #. TRANSLATORS: window title for the warning dialog -#: ../src/gmw-main.c:1315 +#: src/gmw-main.c:1214 msgid "Write to all disks?" -msgstr "Écrire sur tous les supports ?" +msgstr "Écrire sur tous les supports ?" #. TRANSLATORS: check that we can nuke everything from all disks -#: ../src/gmw-main.c:1320 +#: src/gmw-main.c:1219 msgid "All data on the drives will be deleted." msgstr "Toutes les données des périphériques seront effacées." #. TRANSLATORS: if the image file is smaller than the disks and #. * we've disabled wiping the device we only write enough data #. * to transfer the image -#: ../src/gmw-main.c:1325 +#: src/gmw-main.c:1224 msgid "The ISO file is smaller than the disk capacity." msgstr "Le fichier ISO a une taille inférieure au disque." #. TRANSLATORS: this could leave your personal files on the drive -#: ../src/gmw-main.c:1330 +#: src/gmw-main.c:1229 msgid "" "Some of the current contents of the drives could be still found using " "forensic tools even after copying." msgstr "" "Certains des contenus actuels des disques pourraient être retrouvés en " -"utilisant des outils d'analyse même après la copie." +"utilisant des outils d’analyse même après la copie." #. TRANSLATORS: button text for the warning dialog -#: ../src/gmw-main.c:1337 +#: src/gmw-main.c:1236 msgid "I Understand" msgstr "Je comprends" #. TRANSLATORS: the title of the about window -#: ../src/gmw-main.c:1375 +#: src/gmw-main.c:1268 msgid "About GNOME MultiWriter" msgstr "À propos de GNOME MultiWriter" #. TRANSLATORS: you can put your name here :) -#: ../src/gmw-main.c:1385 +#: src/gmw-main.c:1278 msgid "translator-credits" msgstr "" "Clément Guérin <geecko.dev(a)free.fr>\n" @@ -354,33 +342,53 @@ #. TRANSLATORS: a switch label: verify the image by #. * reading back the original image from the device -#: ../src/gmw-main.c:1438 +#: src/gmw-main.c:1325 msgid "Verify" msgstr "Vérifier" #. TRANSLATORS: a switch label: we write zeros after #. * the image so it erases the entire device -#: ../src/gmw-main.c:1444 +#: src/gmw-main.c:1331 msgid "Wipe" msgstr "Effacer" #. TRANSLATORS: a switch label: we check the device #. * is actually the size it says it is -#: ../src/gmw-main.c:1450 +#: src/gmw-main.c:1337 msgid "Probe" msgstr "Sonder" #. TRANSLATORS: command line option -#: ../src/gmw-main.c:1817 +#: src/gmw-main.c:1668 msgid "Allow renaming the labels on hubs" msgstr "Autorise le renommage des étiquettes de concentrateurs." #. TRANSLATORS: command line option -#: ../src/gmw-main.c:1820 ../src/gmw-probe.c:535 +#: src/gmw-main.c:1671 src/gmw-probe.c:497 msgid "Show extra debugging information" msgstr "Afficher des informations de débogage supplémentaires" #. TRANSLATORS: the user has sausages for fingers -#: ../src/gmw-main.c:1839 +#: src/gmw-main.c:1690 msgid "Failed to parse command line options" msgstr "Impossible de traiter les options de ligne de commande" + +#. TRANSLATORS: button to start the copy +#: src/gmw-main.ui:102 +msgid "Start Copying" +msgstr "Démarrer la copie" + +#. TRANSLATORS: app menu item for the file chooser +#: src/gmw-menus.ui:7 +msgid "Import ISO file…" +msgstr "Importer un fichier ISO…" + +#. TRANSLATORS: app menu item for the About UI +#: src/gmw-menus.ui:13 +msgid "_About" +msgstr "À _propos" + +#. TRANSLATORS: app menu item for Quit +#: src/gmw-menus.ui:17 +msgid "_Quit" +msgstr "_Quitter" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-multi-writer-3.32.0/src/gmw-device.c new/gnome-multi-writer-3.32.1/src/gmw-device.c --- old/gnome-multi-writer-3.32.0/src/gmw-device.c 2019-03-08 13:14:45.000000000 +0100 +++ new/gnome-multi-writer-3.32.1/src/gmw-device.c 2019-05-22 15:07:11.000000000 +0200 @@ -28,6 +28,7 @@ #include "gmw-device.h" struct _GmwDevice { + GObject parent_instance; GError *error; /* the error, if any */ GMutex mutex; /* mutex for the device */ GmwDeviceState state; /* the #GmwDeviceState, e.g. %GMW_DEVICE_STATE_WRITE */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-multi-writer-3.32.0/src/gmw-main.c new/gnome-multi-writer-3.32.1/src/gmw-main.c --- old/gnome-multi-writer-3.32.0/src/gmw-main.c 2019-03-08 13:14:45.000000000 +0100 +++ new/gnome-multi-writer-3.32.1/src/gmw-main.c 2019-05-22 15:07:11.000000000 +0200 @@ -1244,7 +1244,7 @@ GList *windows; GtkWindow *parent = NULL; const gchar *authors[] = { "Richard Hughes", NULL }; - const gchar *copyright = "Copyright \xc2\xa9 2014-2015 Richard Hughes"; + const gchar *copyright = "Copyright \xc2\xa9 2014-2018 Richard Hughes"; windows = gtk_application_get_windows (GTK_APPLICATION (priv->application)); if (windows) @@ -1260,7 +1260,7 @@ "comments", _("Write an ISO file to multiple USB devices at once"), "copyright", copyright, "license-type", GTK_LICENSE_GPL_2_0, - "logo-icon-name", "gnome-multi-writer", + "logo-icon-name", "org.gnome.MultiWriter", /* TRANSLATORS: you can put your name here :) */ "translator-credits", _("translator-credits"), "version", VERSION, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-multi-writer-3.32.0/src/meson.build new/gnome-multi-writer-3.32.1/src/meson.build --- old/gnome-multi-writer-3.32.0/src/meson.build 2019-03-08 13:14:45.000000000 +0100 +++ new/gnome-multi-writer-3.32.1/src/meson.build 2019-05-22 15:07:11.000000000 +0200 @@ -18,6 +18,7 @@ include_directories('..'), ], dependencies : [ + gio_unix, gtk, gusb, udisks,

1 0

commit tumbler for openSUSE:Factory
by root 24 May '19

24 May '19

Hello community, here is the log from the commit of package tumbler for openSUSE:Factory checked in at 2019-05-24 11:30:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tumbler (Old) and /work/SRC/openSUSE:Factory/.tumbler.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tumbler" Fri May 24 11:30:22 2019 rev:30 rq:704768 version:0.2.4 Changes: -------- --- /work/SRC/openSUSE:Factory/tumbler/tumbler.changes 2018-10-25 09:08:27.434429183 +0200 +++ /work/SRC/openSUSE:Factory/.tumbler.new.5148/tumbler.changes 2019-05-24 11:30:26.913420939 +0200 @@ -1,0 +2,18 @@ +Fri May 17 20:28:30 UTC 2019 - Vinzenz Vietzke <vinz(a)vinzv.de> + +- Update to version 0.2.4 + - Check for sparse video files only on plugin side + - Set Max file sizes + - Add Fujifilm RAF support (bxo#14522) + - Add more media types for audio cover thumbnails (bxo#12041) + - Fix a typo in desktop-thumbnailer-provider.c (bxo#14925) + - Update URLs in README and configure.ac + - Fix g_type_class_add_private is deprecated + - Bump glib version + - Translation Updates +- Added bcond to build with sources from git master branch +- Switched to %autosetup for simpler maintenance +- Switch urls to https:// +- Cleaned up spec file + +------------------------------------------------------------------- Old: ---- tumbler-0.2.3.tar.bz2 New: ---- tumbler-0.2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tumbler.spec ++++++ --- /var/tmp/diff_new_pack.PgYKmc/_old 2019-05-24 11:30:27.741420726 +0200 +++ /var/tmp/diff_new_pack.PgYKmc/_new 2019-05-24 11:30:27.745420725 +0200 @@ -1,7 +1,7 @@ # # spec file for package tumbler # -# 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 @@ -15,17 +15,18 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - -%define libname libtumbler-1-0 +%bcond_with git %bcond_with libffmpegthumbnailer +%define libname libtumbler-1-0 + Name: tumbler -Version: 0.2.3 +Version: 0.2.4 Release: 0 Summary: Thumbnail Management for Xfce License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Graphics/Other -Url: http://www.xfce.org/ -Source: http://archive.xfce.org/src/apps/%{name}/0.2/%{name}-%{version}.tar.bz2 +Url: https://docs.xfce.org/xfce/thunar/tumbler +Source: https://archive.xfce.org/src/apps/%{name}/0.2/%{name}-%{version}.tar.bz2 BuildRequires: intltool BuildRequires: pkgconfig(gio-2.0) >= 2.26.0 BuildRequires: pkgconfig(gio-unix-2.0) >= 2.26.0 @@ -35,9 +36,9 @@ # GdkPibuxf thumbnailer plugin BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.14 # FreeType2 font thumbnailer plugin -BuildRequires: freetype2-devel +BuildRequires: pkgconfig(freetype2) # JPEG thumbnailer plugin with EXIF support -BuildRequires: libjpeg-devel +BuildRequires: pkgconfig(libjpeg) %if %{with libffmpegthumbnailer} # ffmpeg video thumbnailer plugin BuildRequires: pkgconfig(libffmpegthumbnailer) @@ -104,11 +105,17 @@ Provides translations to the package %{name} %prep -%setup -q +%autosetup %build -%configure --disable-static -make %{?_smp_mflags} V=1 +%if %{with git} +NOCONFIGURE=1 ./autogen.sh +%configure \ + --disable-static +%else +%configure +%endif +%make_build %install %make_install @@ -124,9 +131,8 @@ %postun -n %{libname} -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc AUTHORS ChangeLog NEWS README TODO %license COPYING +%doc AUTHORS ChangeLog NEWS README TODO %dir %{_sysconfdir}/xdg/tumbler/ %config(noreplace) %{_sysconfdir}/xdg/tumbler/tumbler.rc %dir %{_libdir}/tumbler-1 @@ -152,21 +158,16 @@ %{_datadir}/dbus-1/services/*.service %files -n %{libname} -%defattr(-,root,root) %license COPYING %{_libdir}/libtumbler-1.so.* %files lang -f %{name}.lang -%defattr(-,root,root) - %files devel -%defattr(-,root,root) %{_includedir}/tumbler-1 %{_libdir}/pkgconfig/tumbler-1.pc %{_libdir}/libtumbler-1.so %files doc -%defattr(-,root,root) %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html %doc %{_datadir}/gtk-doc/html/tumbler ++++++ tumbler-0.2.3.tar.bz2 -> tumbler-0.2.4.tar.bz2 ++++++ ++++ 10116 lines of diff (skipped)

1 0

commit thunar for openSUSE:Factory
by root 24 May '19

24 May '19

Hello community, here is the log from the commit of package thunar for openSUSE:Factory checked in at 2019-05-24 11:30:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/thunar (Old) and /work/SRC/openSUSE:Factory/.thunar.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "thunar" Fri May 24 11:30:19 2019 rev:75 rq:704767 version:1.8.6 Changes: -------- --- /work/SRC/openSUSE:Factory/thunar/thunar.changes 2019-01-28 20:50:39.689764922 +0100 +++ /work/SRC/openSUSE:Factory/.thunar.new.5148/thunar.changes 2019-05-24 11:30:21.385422363 +0200 @@ -1,0 +2,59 @@ +Mon May 20 14:12:38 UTC 2019 - Maurizio Galli <maurizio.galli(a)gmail.com> + +- Fixed Xfce bug trackers in previous changelog entry + +------------------------------------------------------------------- +Mon May 20 12:05:38 UTC 2019 - Marcel Kuehlhorn <tux93(a)opensuse.org> + +- Update to version 1.8.6 + * Job is now optional for thunar_io_scan_directory + * Expand scroll window of file operation progress dialog (bxo#14946) + * Fix compiler error -Wcast-function-type (GCC 8) + * Bump glib minimal required version + * Fix g_type_class_add_private is deprecated + * Small code cleanup + * Fix pathbar to on middle click open folders in new tabs (bxo#15302) + * Translation updates: Danish +- Dropped thunar-job-optional.patch since it was fixed upstream + +------------------------------------------------------------------- +Sat May 18 12:45:03 UTC 2019 - Maurizio Galli <maurizio.galli(a)gmail.com> + +- Added patch from upstream: thunar-job-optional.patch + prevent Thunar segfault at startup: + make Job optional for thunar_io_scan_directory + +------------------------------------------------------------------- +Sat May 18 08:50:57 UTC 2019 - Maurizio Galli <maurizio.galli(a)gmail.com> + +- Update to version 1.8.5 + - Do not exit when dbus name registration fails (bxo#15149) + - tree view jumps (scrolls) when clicking on a directory (bxo#15174) + - Correctly check if destination is writable (bxo#14718) + - Make tree-view 'Move to Trash' icon the same as in main pane + - Make toggle for the delete entry affect tree-view side pane too + - Pathbar buttons are now resized on folder rename (bxo#15024) + - Load templates synchronously (bxo#15200) + - delete key in tree-view can delete the user home folder (bxo#15095) + - Hide unneeded context menu entries for folder "Trash" in tree view + - crash after clicking when XDG_SESSION_TYPE isn't set (bxo#15366) + - man page incorrectly suggests '-v' instead of '-V' + - Fix how wallpaper is set on Gnome + - SEGV (11) on USB-flash connection (bxo#13813) + - Fix session startup priority + - Fix queued context menu popup + - Restore right-click drag and drop functionality (bxo#14583) + - Translation updates +- Dropped obsolete patch thunar-1.8.4-fix-context-menu.patch +- Added conditional %bcond_with git for building with git master branch +- Updated URL +- Use /metainfo instead of /appdata and drop obsolete file edits +- Other spec file cleanups + +------------------------------------------------------------------- +Mon May 13 18:09:47 UTC 2019 - Maurizio Galli <maurizio.galli(a)gmail.com> + +- Added thunar-1.8.4-fix-context-menu.patch fixing "create document" + sub-menu not showing any content (boo#1134899) + +------------------------------------------------------------------- Old: ---- Thunar-1.8.4.tar.bz2 New: ---- Thunar-1.8.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ thunar.spec ++++++ --- /var/tmp/diff_new_pack.E7uQhp/_old 2019-05-24 11:30:22.093422180 +0200 +++ /var/tmp/diff_new_pack.E7uQhp/_new 2019-05-24 11:30:22.093422180 +0200 @@ -17,14 +17,19 @@ %define libname libthunarx-3-0 +%bcond_with git Name: thunar -Version: 1.8.4 +Version: 1.8.6 Release: 0 Summary: File Manager for the Xfce Desktop Environment License: GPL-2.0-or-later Group: Productivity/File utilities -Url: http://thunar.xfce.org/ -Source: http://archive.xfce.org/src/xfce/thunar/1.8/Thunar-%{version}.tar.bz2 +Url: https://docs.xfce.org/xfce/thunar/start +%if %{with git} +Source: Thunar-%{version}.tar.bz2 +%else +Source: https://archive.xfce.org/src/xfce/thunar/1.8/Thunar-%{version}.tar.bz2 +%endif Source100: %{name}-rpmlintrc # PATCH-FIX-UPSTREAM thunar-use-xdg-icon-spec-icons.patch gber(a)opensuse.org -- Use generic icons that conform to the XDG Icon Naming Spec Patch0: thunar-use-xdg-icon-spec-icons.patch @@ -102,16 +107,27 @@ %description -n typelib-1_0-Thunarx-3_0 This package provides the GObject Introspection bindings for the Thunar extension library %{libname}. - %lang_package %prep %setup -q -n Thunar-%{version} %patch0 -p1 %patch1 -p1 -sed -i -e 's#/metainfo#/appdata#' Makefile.{am,in} %build +%if %{with git} +NOCONFIGURE=1 ./autogen.sh +%configure \ + --enable-maintainer-mode \ + --with-helper-path-prefix=%{_libexecdir} \ + --docdir=%{_datadir}/xfce4/Thunar \ + --enable-dbus \ + --enable-exif \ + --enable-startup-notification \ + --enable-pcre \ + --enable-gtk-doc \ + --disable-static +%else %configure \ --with-helper-path-prefix=%{_libexecdir} \ --docdir=%{_datadir}/xfce4/Thunar \ @@ -121,7 +137,8 @@ --enable-pcre \ --enable-gtk-doc \ --disable-static -make %{?_smp_mflags} V=1 +%endif +%make_build %install %make_install @@ -146,8 +163,6 @@ %suse_update_desktop_file -i Thunar-folder-handler System Utility Core GTK FileManager %find_lang Thunar %{?no_lang_C} -# rename processed Thunar.desktop to match thunar.appdata.xml's name. -mv %{buildroot}%{_datadir}/applications/Thunar.desktop %{buildroot}%{_datadir}/applications/thunar.desktop %fdupes %{buildroot}%{_datadir} @@ -169,7 +184,7 @@ %{_libdir}/thunarx-3 %{_libdir}/xfce4/panel/plugins/libthunar-tpa.so %{_datadir}/Thunar -%{_datadir}/appdata/org.xfce.thunar.appdata.xml +%{_datadir}/metainfo/org.xfce.thunar.appdata.xml %{_datadir}/applications/*.desktop %{_datadir}/dbus-1/services/org.xfce.FileManager.service %{_datadir}/dbus-1/services/org.xfce.Thunar.service @@ -187,7 +202,6 @@ %{_libdir}/libthunarx-3.so.* %files -n typelib-1_0-Thunarx-3_0 -%defattr(-,root,root) %{_libdir}/girepository-1.0/Thunarx-3.0.typelib %files devel ++++++ Thunar-1.8.4.tar.bz2 -> Thunar-1.8.6.tar.bz2 ++++++ ++++ 94404 lines of diff (skipped)

1 0

commit python-jdcal for openSUSE:Factory
by root 24 May '19

24 May '19

Hello community, here is the log from the commit of package python-jdcal for openSUSE:Factory checked in at 2019-05-24 11:30:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-jdcal (Old) and /work/SRC/openSUSE:Factory/.python-jdcal.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-jdcal" Fri May 24 11:30:12 2019 rev:6 rq:704752 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-jdcal/python-jdcal.changes 2018-12-24 11:38:32.317604030 +0100 +++ /work/SRC/openSUSE:Factory/.python-jdcal.new.5148/python-jdcal.changes 2019-05-24 11:30:17.005423491 +0200 @@ -1,0 +2,9 @@ +Wed May 22 12:52:40 UTC 2019 - pgajdos(a)suse.com + +- version update to 1.4.1 + * Remove testing for Python 2.6 and 3.3. + * Added testing for Python 3.7. + * Removed unused function `fpart`. +- use pytest macro + +------------------------------------------------------------------- Old: ---- jdcal-1.4.tar.gz New: ---- jdcal-1.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-jdcal.spec ++++++ --- /var/tmp/diff_new_pack.iSiznQ/_old 2019-05-24 11:30:17.745423300 +0200 +++ /var/tmp/diff_new_pack.iSiznQ/_new 2019-05-24 11:30:17.745423300 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-jdcal # -# 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 @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-jdcal -Version: 1.4 +Version: 1.4.1 Release: 0 Summary: Julian dates from proleptic Gregorian and Julian calendars License: BSD-2-Clause @@ -55,7 +55,7 @@ %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%python_exec test_jdcal.py +%pytest %files %{python_files} %doc README.rst ++++++ jdcal-1.4.tar.gz -> jdcal-1.4.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdcal-1.4/PKG-INFO new/jdcal-1.4.1/PKG-INFO --- old/jdcal-1.4/PKG-INFO 2018-04-14 16:48:01.000000000 +0200 +++ new/jdcal-1.4.1/PKG-INFO 2019-04-24 12:21:00.000000000 +0200 @@ -1,19 +1,18 @@ Metadata-Version: 1.1 Name: jdcal -Version: 1.4 +Version: 1.4.1 Summary: Julian dates from proleptic Gregorian and Julian calendars. Home-page: https://github.com/phn/jdcal Author: Prasanth Nair Author-email: prasanthhn(a)gmail.com License: BSD -Description-Content-Type: UNKNOWN Description: jdcal ===== .. _TPM: http://www.sal.wisc.edu/~jwp/astro/tpm/tpm.html .. _Jeffrey W. Percival: http://www.sal.wisc.edu/~jwp/ .. _IAU SOFA: http://www.iausofa.org/ - .. _pip: https://pypi.python.org/pypi/pip + .. _pip: https://pypi.org/project/pip/ .. _easy_install: https://setuptools.readthedocs.io/en/latest/easy_install.html .. image:: https://travis-ci.org/phn/jdcal.svg?branch=master @@ -166,12 +165,11 @@ Classifier: Topic :: Scientific/Engineering :: Astronomy Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.6 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.3 Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: Python :: Implementation :: PyPy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdcal-1.4/README.rst new/jdcal-1.4.1/README.rst --- old/jdcal-1.4/README.rst 2018-04-14 15:48:16.000000000 +0200 +++ new/jdcal-1.4.1/README.rst 2019-04-24 12:02:28.000000000 +0200 @@ -4,7 +4,7 @@ .. _TPM: http://www.sal.wisc.edu/~jwp/astro/tpm/tpm.html .. _Jeffrey W. Percival: http://www.sal.wisc.edu/~jwp/ .. _IAU SOFA: http://www.iausofa.org/ -.. _pip: https://pypi.python.org/pypi/pip +.. _pip: https://pypi.org/project/pip/ .. _easy_install: https://setuptools.readthedocs.io/en/latest/easy_install.html .. image:: https://travis-ci.org/phn/jdcal.svg?branch=master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdcal-1.4/jdcal.egg-info/PKG-INFO new/jdcal-1.4.1/jdcal.egg-info/PKG-INFO --- old/jdcal-1.4/jdcal.egg-info/PKG-INFO 2018-04-14 16:48:01.000000000 +0200 +++ new/jdcal-1.4.1/jdcal.egg-info/PKG-INFO 2019-04-24 12:21:00.000000000 +0200 @@ -1,19 +1,18 @@ Metadata-Version: 1.1 Name: jdcal -Version: 1.4 +Version: 1.4.1 Summary: Julian dates from proleptic Gregorian and Julian calendars. Home-page: https://github.com/phn/jdcal Author: Prasanth Nair Author-email: prasanthhn(a)gmail.com License: BSD -Description-Content-Type: UNKNOWN Description: jdcal ===== .. _TPM: http://www.sal.wisc.edu/~jwp/astro/tpm/tpm.html .. _Jeffrey W. Percival: http://www.sal.wisc.edu/~jwp/ .. _IAU SOFA: http://www.iausofa.org/ - .. _pip: https://pypi.python.org/pypi/pip + .. _pip: https://pypi.org/project/pip/ .. _easy_install: https://setuptools.readthedocs.io/en/latest/easy_install.html .. image:: https://travis-ci.org/phn/jdcal.svg?branch=master @@ -166,12 +165,11 @@ Classifier: Topic :: Scientific/Engineering :: Astronomy Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.6 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.3 Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: Python :: Implementation :: PyPy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdcal-1.4/jdcal.py new/jdcal-1.4.1/jdcal.py --- old/jdcal-1.4/jdcal.py 2018-04-14 16:28:36.000000000 +0200 +++ new/jdcal-1.4.1/jdcal.py 2019-04-24 12:12:59.000000000 +0200 @@ -42,17 +42,12 @@ from __future__ import print_function import math -__version__ = "1.4" +__version__ = "1.4.1" MJD_0 = 2400000.5 MJD_JD2000 = 51544.5 -def fpart(x): - """Return fractional part of given number.""" - return math.modf(x)[0] - - def ipart(x): """Return integer part of given number.""" return math.modf(x)[1] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdcal-1.4/setup.py new/jdcal-1.4.1/setup.py --- old/jdcal-1.4/setup.py 2018-04-14 16:42:47.000000000 +0200 +++ new/jdcal-1.4.1/setup.py 2019-04-24 12:02:28.000000000 +0200 @@ -25,13 +25,12 @@ 'Topic :: Scientific/Engineering :: Astronomy', 'Programming Language :: Python', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdcal-1.4/test_jdcal.py new/jdcal-1.4.1/test_jdcal.py --- old/jdcal-1.4/test_jdcal.py 2018-04-14 16:23:07.000000000 +0200 +++ new/jdcal-1.4.1/test_jdcal.py 2019-04-24 12:02:28.000000000 +0200 @@ -2,14 +2,7 @@ import pytest from jdcal import ( - fpart, ipart, is_leap, gcal2jd, jd2gcal, jcal2jd, jd2jcal, MJD_0) - - -def test_fpart(): - assert round(fpart(20.345), 12) == 0.345 - assert round(fpart(-20.345), 12) == -0.345 - assert round(fpart(0.12345), 12) == 0.12345 - assert round(fpart(-0.6789), 12) == -0.6789 + ipart, is_leap, gcal2jd, jd2gcal, jcal2jd, jd2jcal, MJD_0) def test_ipart():

1 0

commit opi for openSUSE:Factory
by root 24 May '19

24 May '19

Hello community, here is the log from the commit of package opi for openSUSE:Factory checked in at 2019-05-24 11:30:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opi (Old) and /work/SRC/openSUSE:Factory/.opi.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opi" Fri May 24 11:30:05 2019 rev:4 rq:704744 version:0.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/opi/opi.changes 2019-05-10 09:19:39.732452900 +0200 +++ /work/SRC/openSUSE:Factory/.opi.new.5148/opi.changes 2019-05-24 11:30:11.749424845 +0200 @@ -1,0 +2,14 @@ +Wed May 22 13:09:33 UTC 2019 - Yunhe Guo <i(a)guoyunhe.me> + +- Version 0.5.0 + * Added + - API proxy server to prevent hard-coded passwords in the script + +------------------------------------------------------------------- +Tue May 21 11:58:53 UTC 2019 - Yunhe Guo <i(a)guoyunhe.me> + +- Version 0.4.0 + * Added + - PMBS (Packman Build Service) support + +------------------------------------------------------------------- Old: ---- opi-0.3.2.tar.gz New: ---- opi-0.5.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opi.spec ++++++ --- /var/tmp/diff_new_pack.SNh5UY/_old 2019-05-24 11:30:12.429424670 +0200 +++ /var/tmp/diff_new_pack.SNh5UY/_new 2019-05-24 11:30:12.433424669 +0200 @@ -17,7 +17,7 @@ Name: opi -Version: 0.3.2 +Version: 0.5.0 Release: 0 Summary: OBS Package Installer (CLI) License: GPL-3.0 ++++++ opi-0.3.2.tar.gz -> opi-0.5.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opi-0.3.2/CHANGELOG.md new/opi-0.5.0/CHANGELOG.md --- old/opi-0.3.2/CHANGELOG.md 2019-05-09 13:19:14.000000000 +0200 +++ new/opi-0.5.0/CHANGELOG.md 2019-05-22 15:07:16.000000000 +0200 @@ -7,6 +7,18 @@ ## [Unreleased] +## [0.5.0] + +### Added + +- API proxy server to prevent hard-coded passwords in the script [#4](https://github.com/openSUSE-zh/opi/issues/4) + +## [0.4.0] + +### Added + +- PMBS (Packman Build Service) support [#5](https://github.com/openSUSE-zh/opi/issues/5) + ## [0.3.2] ### Fixed @@ -60,7 +72,9 @@ - Choose package and install - Keep or remove repository after installation -[Unreleased]: https://github.com/openSUSE-zh/opi/compare/v0.3.2...HEAD +[Unreleased]: https://github.com/openSUSE-zh/opi/compare/v0.5.0...HEAD +[0.5.0]: https://github.com/openSUSE-zh/opi/compare/v0.4.0...v0.5.0 +[0.4.0]: https://github.com/openSUSE-zh/opi/compare/v0.3.2...v0.4.0 [0.3.2]: https://github.com/openSUSE-zh/opi/compare/v0.3.1...v0.3.2 [0.3.1]: https://github.com/openSUSE-zh/opi/compare/v0.3.0...v0.3.1 [0.3.0]: https://github.com/openSUSE-zh/opi/compare/v0.2.0...v0.3.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opi-0.3.2/README.md new/opi-0.5.0/README.md --- old/opi-0.3.2/README.md 2019-05-09 13:19:14.000000000 +0200 +++ new/opi-0.5.0/README.md 2019-05-22 15:07:16.000000000 +0200 @@ -2,6 +2,11 @@ **O**BS **P**ackage **I**nstaller +Search and install almost all packages available for openSUSE and SLE: + +1. openSUSE Build Service +2. Packman + ## System Requirements - openSUSE Tumbleweed, openSUSE Leap 42.1+, SLE 12+ @@ -13,8 +18,24 @@ ## Install +### openSUSE Tumbleweed + +``` +sudo zypper install opi ``` -sudo zypper addrepo https://download.opensuse.org/repositories/home:guoyunhe/openSUSE_Tumblewee… + +## Leap and SLE + +``` +# Leap 15.0 +sudo zypper addrepo https://download.opensuse.org/repositories/home:guoyunhe/openSUSE_Leap_15.0… +# Leap 15.1 +sudo zypper addrepo https://download.opensuse.org/repositories/home:guoyunhe/openSUSE_Leap_15.1… +# Leap 42.3 +sudo zypper addrepo https://download.opensuse.org/repositories/home:guoyunhe/openSUSE_Leap_42.3… +# SLE 15 +sudo zypper addrepo https://download.opensuse.org/repositories/home:guoyunhe/SLE_15/home:guoyun… + sudo zypper refresh sudo zypper install opi ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opi-0.3.2/opi new/opi-0.5.0/opi --- old/opi-0.3.2/opi 2019-05-09 13:19:14.000000000 +0200 +++ new/opi-0.5.0/opi 2019-05-22 15:07:16.000000000 +0200 @@ -54,15 +54,15 @@ # # API configuration # -my $username = 'wiki_hermes'; -my $password = 'w_h_p1'; -my $server = "https://$username:$password\@api.opensuse.org"; - +my $obs_apiroot = 'https://api.opensuse.org'; +my $pmbs_apiroot = 'https://pmbs.links2linux.de'; # # Search packages # -my @bins = search_published_binary(@ARGV); +my @obs = search_published_binary('openSUSE', $obs_apiroot, @ARGV); +my @pmbs = search_published_binary('Packman', $pmbs_apiroot, @ARGV); +my @bins = sort_binaries(@obs, @pmbs); my @binary_names = get_binary_names(@bins); if (!scalar(@bins)) { @@ -118,6 +118,7 @@ =cut sub get_distribution { + my $prefix = shift; my $config = Config::Tiny->read('/etc/os-release'); my $name = $config->{_}->{NAME}; my $version = $config->{_}->{VERSION}; @@ -126,15 +127,19 @@ $version = substr $version, 1, -1; # Remove quotes } if ($name eq 'openSUSE Tumbleweed') { - return 'openSUSE:Factory'; + $name = 'openSUSE:Factory'; } elsif ($name eq 'openSUSE Leap') { - return 'openSUSE:Leap:' . $version; + $name = 'openSUSE:Leap:' . $version; } elsif (substr($name, 0, 3) eq 'SLE') { - return 'SLE' . $version; + $name = 'SLE' . $version; } else { print "Your distribution $name $version is not supported.\n"; exit 1; } + if ($prefix) { + $name = 'openSUSE.org:' . $name; + } + return $name; } sub get_architecture { @@ -238,10 +243,16 @@ $symbol = '?'; } - my $colored_name = colored(substr($binary->{project}, 0, 39) . ' ' . $symbol, $color); + my $project = $binary->{project}; + my $obs_instance = $binary->{obs_instance}; + if ($obs_instance ne 'openSUSE') { + $project = "$obs_instance $project"; + } + + my $colored_name = colored(substr($project, 0, 39) . ' ' . $symbol, $color); if ($number) { - printf("%2d. %-50s | %-10s | %-10s\n", $number, $colored_name, $binary->{version}, $binary->{arch}); + printf("%2d. %-50s | %-10s | %-10s\n", $number, $colored_name, substr($binary->{version}, 0, 10), $binary->{arch}); } else { print $colored_name, " | ", $binary->{version}, " | ", $binary->{arch}; } @@ -261,16 +272,23 @@ } sub search_published_binary { - my $distribution = get_distribution(); + my $obs_instance = shift; + my $obs_apiroot = shift; + + my $distribution = get_distribution($obs_instance ne 'openSUSE'); + + my $proxy_root = 'https://guoyunhe.me/opi/proxy/index.php'; my $endpoint = '/search/published/binary/id'; my $query_string = prepare_query_string(@_); my $xpath = "contains-ic(\@name, $query_string) and path/project='$distribution'"; - my $url = $server . $endpoint . '?match=' . uri_escape($xpath); + my $url = $obs_apiroot . $endpoint . '?match=' . uri_escape($xpath); + + my $prox_url = $proxy_root . '?obs_api_link=' . uri_escape($url) . '&obs_instance=' . $obs_instance; - my $req = HTTP::Request->new(GET => $url); + my $req = HTTP::Request->new(GET => $prox_url); my $ua = LWP::UserAgent->new; my $resp = $ua->request($req); if ($resp->is_success) { @@ -284,6 +302,7 @@ foreach my $binary ($dom->findnodes('/collection/binary')) { my %binary_data; + $binary_data{'obs_instance'} = $obs_instance; $binary_data{'name'} = $binary->getAttribute('name'); $binary_data{'project'} = $binary->getAttribute('project'); $binary_data{'package'} = $binary->getAttribute('package'); @@ -295,33 +314,43 @@ $binary_data{'filepath'} = $binary->getAttribute('filepath'); $binary_data{'baseproject'} = $binary->getAttribute('baseproject'); $binary_data{'type'} = $binary->getAttribute('type'); - # Filter out ghost binary (package has been deleted, but binary still exists) + + # Filter out ghost binary + # (package has been deleted, but binary still exists) if ( ! $binary_data{'package'} ) { next; } # Filter out branch projects - if ( $binary->{project} =~ /:branches:/m ) { + if ( $binary_data{'project'} =~ /:branches:/m ) { + next; + } + + # Filter out Packman personal projects + if ( + $binary_data{'obs_instance'} ne 'openSUSE' + && is_personal_project($binary_data{'project'}) + ) { next; } # Filter out debuginfo, debugsource, buildsymbols packages - if ( substr($binary->{'name'}, -10) eq '-debuginfo' ) { + if ( substr($binary_data{'name'}, -10) eq '-debuginfo' ) { next; - } elsif ( substr($binary->{'name'}, -12) eq '-debugsource' ) { + } elsif ( substr($binary_data{'name'}, -12) eq '-debugsource' ) { next; - } elsif ( substr($binary->{'name'}, -13) eq '-buildsymbols' ) { + } elsif ( substr($binary_data{'name'}, -13) eq '-buildsymbols' ) { next; } # Filter out source packages - if ( $binary->{'arch'} eq 'src' ) { + if ( $binary_data{'arch'} eq 'src' ) { next; } # Filter architecture - unless ( $binary->{'arch'} eq $arch || $binary->{'arch'} eq 'noarch') { - unless ( $binary->{'arch'} eq 'i586' && $arch eq 'x86_64' ) { + unless ( $binary_data{'arch'} eq $arch || $binary_data{'arch'} eq 'noarch') { + unless ( $binary_data{'arch'} eq 'i586' && $arch eq 'x86_64' ) { next; } } @@ -329,7 +358,7 @@ push @collection, \%binary_data; } - return sort { -get_binary_weight($a) <=> -get_binary_weight($b) } @collection; + return @collection; } else { if ($resp->code == 413) { @@ -358,6 +387,10 @@ return @names; } +sub sort_binaries { + return sort { -get_binary_weight($a) <=> -get_binary_weight($b) } @_; +} + sub get_binary_weight { my $binary = shift; my $weight = 0; @@ -419,14 +452,21 @@ =cut sub install_binary { - my $binary = $_[0]; + my $binary = shift; my $name = $binary->{name}; + my $obs_instance = $binary->{obs_instance}; my $arch = $binary->{arch}; my $project = $binary->{project}; my $repository = $binary->{repository}; + # Install Packman packages + if ($obs_instance eq 'Packman') { + add_packman_repo(); + + install_packman_packages("$name.$arch"); + } # Install official packages. Don't add repositories - if (is_official_project($project)) { + elsif (is_official_project($project)) { system "sudo zypper install $name.$arch"; } # Install experimental and personal packages @@ -448,9 +488,9 @@ return; } - add_packman_essentials_repo(); + add_packman_repo(1); - install_packman_essentials_packages( + install_packman_packages( 'ffmpeg', 'gstreamer-plugins-bad', 'gstreamer-plugins-libav', @@ -467,7 +507,8 @@ exit; } -sub add_packman_essentials_repo { +sub add_packman_repo { + my $dup = shift; my $prefix = get_distribution(); $prefix =~ s/:/_/ig; @@ -476,14 +517,17 @@ $prefix = 'openSUSE_Tumbleweed'; } - system "sudo zypper addrepo --refresh --priority 90 https://ftp.gwdg.de/pub/linux/misc/packman/suse/$prefix/Essentials/packman-…"; + system "sudo zypper addrepo --refresh --priority 90 https://ftp.gwdg.de/pub/linux/misc/packman/suse/$prefix/packman.repo"; system "sudo zypper refresh"; - system "sudo zypper dist-upgrade --from packman-essentials --allow-downgrade --allow-vendor-change"; + + if ($dup) { + system "sudo zypper dist-upgrade --from packman --allow-downgrade --allow-vendor-change"; + } } -sub install_packman_essentials_packages { +sub install_packman_packages { my $packages = join ' ', @_; - system "sudo zypper install --repo packman-essentials $packages"; + system "sudo zypper install --repo packman $packages"; } sub install_vs_code { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opi-0.3.2/proxy/.gitignore new/opi-0.5.0/proxy/.gitignore --- old/opi-0.3.2/proxy/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/opi-0.5.0/proxy/.gitignore 2019-05-22 15:07:16.000000000 +0200 @@ -0,0 +1,2 @@ +vendor +config.php diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opi-0.3.2/proxy/composer.json new/opi-0.5.0/proxy/composer.json --- old/opi-0.3.2/proxy/composer.json 1970-01-01 01:00:00.000000000 +0100 +++ new/opi-0.5.0/proxy/composer.json 2019-05-22 15:07:16.000000000 +0200 @@ -0,0 +1,5 @@ +{ + "require": { + "davedevelopment/stiphle": "^0.9.2" + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opi-0.3.2/proxy/composer.lock new/opi-0.5.0/proxy/composer.lock --- old/opi-0.3.2/proxy/composer.lock 1970-01-01 01:00:00.000000000 +0100 +++ new/opi-0.5.0/proxy/composer.lock 2019-05-22 15:07:16.000000000 +0200 @@ -0,0 +1,70 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "8be3fec76a27c45a4bf9c51a99f497b1", + "packages": [ + { + "name": "davedevelopment/stiphle", + "version": "0.9.2", + "source": { + "type": "git", + "url": "https://github.com/davedevelopment/stiphle.git", + "reference": "76151e6474741adee258c1a4860a0460e319563b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/davedevelopment/stiphle/zipball/76151e6474741a…", + "reference": "76151e6474741adee258c1a4860a0460e319563b", + "shasum": "" + }, + "require": { + "php": ">=5.3.1" + }, + "require-dev": { + "phpunit/phpunit": "^5.5", + "predis/predis": "^1.1" + }, + "suggest": { + "doctrine/cache": "~1.0", + "predis/predis": "~1.1" + }, + "type": "library", + "autoload": { + "psr-0": { + "Stiphle": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Dave Marshall", + "email": "dave.marshall(a)atstsolutions.co.uk", + "homepage": "http://davedevelopment.co.uk" + } + ], + "description": "Simple rate limiting/throttling for php", + "homepage": "http://github.com/davedevelopment/stiphle", + "keywords": [ + "rate limit", + "rate limiting", + "throttle", + "throttling" + ], + "time": "2017-08-16T07:58:18+00:00" + } + ], + "packages-dev": [], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": [], + "platform-dev": [] +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opi-0.3.2/proxy/config.example.php new/opi-0.5.0/proxy/config.example.php --- old/opi-0.3.2/proxy/config.example.php 1970-01-01 01:00:00.000000000 +0100 +++ new/opi-0.5.0/proxy/config.example.php 2019-05-22 15:07:16.000000000 +0200 @@ -0,0 +1,8 @@ +<?php + +# Copy and rename this file to 'config.php' and fill in your API credentials + +$obs_username = ''; +$obs_password = ''; +$pmbs_username = ''; +$pmbs_password = ''; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opi-0.3.2/proxy/index.php new/opi-0.5.0/proxy/index.php --- old/opi-0.3.2/proxy/index.php 1970-01-01 01:00:00.000000000 +0100 +++ new/opi-0.5.0/proxy/index.php 2019-05-22 15:07:16.000000000 +0200 @@ -0,0 +1,23 @@ +<?php + +# Test it with `php -S localhost:8000 index.php` + +require __DIR__ . '/vendor/autoload.php'; +require __DIR__ . '/config.php'; + +# TODO add API rate limits. + +$obs_api_link = $_GET['obs_api_link']; +$obs_instance = $_GET['obs_instance']; # OBS / Packman + +if ($obs_instance === 'openSUSE') { + $username = $obs_username; + $password = $obs_password; +} elseif ($obs_instance === 'Packman') { + $username = $pmbs_username; + $password = $pmbs_password; +} + +$obs_api_link = str_replace('://', "://$username:$password@", $obs_api_link); + +echo file_get_contents($obs_api_link);

1 0