openSUSE Commits
Threads by month
- ----- 2024 -----
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
January 2018
- 1 participants
- 2007 discussions
Hello community,
here is the log from the commit of package zimg for openSUSE:Factory checked in at 2018-01-01 22:32:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zimg (Old)
and /work/SRC/openSUSE:Factory/.zimg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zimg"
Mon Jan 1 22:32:51 2018 rev:22 rq:560903 version:2.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/zimg/zimg.changes 2017-12-19 10:50:43.563830953 +0100
+++ /work/SRC/openSUSE:Factory/.zimg.new/zimg.changes 2018-01-01 22:34:47.504785637 +0100
@@ -1,0 +2,13 @@
+Sun Dec 31 19:17:05 UTC 2017 - 9(a)cirno.systems
+
+- Update to 2.7
+ * colorspace: add support for additional
+ matrix/transfer/primaries
+ * graph: reduce buffer copies when converting from grey to color
+ * graph: reduce buffer copies when performing colorspace
+ conversion
+ * graph: process input planes separately when possible
+ * graph: optimize calculation of tile width
+ * x86: automatic cache size detection for Intel processors
+
+-------------------------------------------------------------------
Old:
----
release-2.6.3.tar.gz
New:
----
release-2.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zimg.spec ++++++
--- /var/tmp/diff_new_pack.9bg65O/_old 2018-01-01 22:34:55.454131571 +0100
+++ /var/tmp/diff_new_pack.9bg65O/_new 2018-01-01 22:34:55.458130237 +0100
@@ -18,7 +18,7 @@
%define sover 2
Name: zimg
-Version: 2.6.3
+Version: 2.7
Release: 0
Summary: Scaling, colorspace conversion, and dithering library
License: WTFPL
++++++ release-2.6.3.tar.gz -> release-2.7.tar.gz ++++++
++++ 5695 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package httrack for openSUSE:Factory checked in at 2018-01-01 22:31:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/httrack (Old)
and /work/SRC/openSUSE:Factory/.httrack.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "httrack"
Mon Jan 1 22:31:10 2018 rev:10 rq:560894 version:3.49.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/httrack/httrack.changes 2016-08-05 18:17:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.httrack.new/httrack.changes 2018-01-01 22:31:22.441250467 +0100
@@ -1,0 +2,10 @@
+Sun Oct 1 15:42:18 UTC 2017 - malcolmlewis(a)opensuse.org
+
+- Updated to version 3.49.2:
+ * Fixed: Buffer overflow in output option commandline argument
+ (VL-ID 2068).
+ * Minor fixes.
+- Changes from version 3.48.23:
+ * Fixed: FTBFS with openssl 1.1.0.
+
+-------------------------------------------------------------------
Old:
----
httrack-3.48.22.tar.gz
New:
----
httrack-3.49.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ httrack.spec ++++++
--- /var/tmp/diff_new_pack.kiHiub/_old 2018-01-01 22:31:24.816457456 +0100
+++ /var/tmp/diff_new_pack.kiHiub/_new 2018-01-01 22:31:24.820456121 +0100
@@ -1,7 +1,7 @@
#
# spec file for package httrack
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2011 Malcolm Lewis malcolmlewis(a)opensuse.org
#
# All modifications and additions to the file contributed by third parties
@@ -19,13 +19,13 @@
%define so_ver 2
Name: httrack
-Version: 3.48.22
+Version: 3.49.2
Release: 0
Summary: Offline Browser Utility
License: GPL-3.0+
Group: Productivity/Networking/Web/Utilities
Url: http://www.httrack.com/
-Source0: http://download.httrack.com/%{name}-%{version}.tar.gz
+Source0: https://mirror.httrack.com/%{name}-%{version}.tar.gz
# PATCH-FIX-OPENSUSE httrack-fix-strict-aliasing-punning.patch malcolmlewis(a)opensuse.org -- Add -fno-strict-aliasing to DEFAULT_CFLAGS
Patch0: httrack-fix-strict-aliasing-punning.patch
BuildRequires: fdupes
++++++ httrack-3.48.22.tar.gz -> httrack-3.49.2.tar.gz ++++++
++++ 1718 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/README new/httrack-3.49.2/README
--- old/httrack-3.48.22/README 2016-04-26 19:25:35.000000000 +0200
+++ new/httrack-3.49.2/README 2017-04-01 21:38:16.000000000 +0200
@@ -1,5 +1,5 @@
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
Welcome to HTTrack Website Copier!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/configure.ac new/httrack-3.49.2/configure.ac
--- old/httrack-3.48.22/configure.ac 2016-04-26 19:41:03.000000000 +0200
+++ new/httrack-3.49.2/configure.ac 2017-05-20 10:45:07.000000000 +0200
@@ -1,6 +1,6 @@
AC_PREREQ(2.59)
-AC_INIT([httrack], [3.48.22], [roche+packaging(a)httrack.com], [httrack], [http://www.httrack.com/])
+AC_INIT([httrack], [3.49.2], [roche+packaging(a)httrack.com], [httrack], [http://www.httrack.com/])
AC_COPYRIGHT([
HTTrack Website Copier, Offline Browser for Windows and Unix
Copyright (C) 1998-2015 Xavier Roche and other contributors
@@ -31,7 +31,7 @@
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS(config.h)
AM_INIT_AUTOMAKE([subdir-objects])
-VERSION_INFO="2:48:0"
+VERSION_INFO="2:49:0"
AM_MAINTAINER_MODE
AC_USE_SYSTEM_EXTENSIONS
@@ -160,7 +160,7 @@
]
)
LIBS="$LIBS $OPENSSL_LIBS"
-AC_CHECK_LIB(ssl, SSL_library_init,
+AC_CHECK_LIB(ssl, SSL_CTX_new,
[
OPENSSL_LIBS="$OPENSSL_LIBS -lssl"
AC_DEFINE(HTS_USEOPENSSL, 1, [Check for OpenSSL])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/history.txt new/httrack-3.49.2/history.txt
--- old/httrack-3.48.22/history.txt 2016-04-26 19:40:44.000000000 +0200
+++ new/httrack-3.49.2/history.txt 2017-05-20 10:44:29.000000000 +0200
@@ -4,6 +4,13 @@
This file lists all changes and fixes that have been made for HTTrack
+3.49-2
++ Fixed: Buffer overflow in output option commandline argument (VL-ID 2068) (Hosein Askari)
++ Fixed: Minor fixes
+
+3.48-23
++ Fixed: on Linux, FTBFS with openssl 1.1.0
+
3.48-22
+ Fixed: on Windows, fixed possible DLL local injection (Tunisian Cyber)
+ Fixed: various typos
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/html/fcguide.html new/httrack-3.49.2/html/fcguide.html
--- old/httrack-3.48.22/html/fcguide.html 2016-04-26 19:10:23.000000000 +0200
+++ new/httrack-3.49.2/html/fcguide.html 2017-04-01 18:11:25.000000000 +0200
@@ -121,7 +121,7 @@
precisely the right thing to do at any given point. I was using
recepies rather than knowledge to get the job done - and I was pestering
the authors for those recepies. After a few days of very helpful
-assistance from the authors I volenteered to write a users manual for
+assistance from the authors I volunteered to write a users manual for
httrack - and here it is. I hope it gets the job done.
<hr>
@@ -645,14 +645,14 @@
the remainder of the questions required to mirror the site.
<p align=justify> The -g option allows you to get the files exactly as
-they are and store them in the currant directory. This is handy for a
+they are and store them in the current directory. This is handy for a
relatively small collection of information where organization isn't
important. With this option, the html files will not even be parsed to
look for other URLs. This option is useful for getting isolated files
(e.g., httrack -g www.mydrivers.com/drivers/windrv32.exe).
-<p align=justify> If I start a collection process and it fails for ome
+<p align=justify> If I start a collection process and it fails for one
reason or another - such as me interrupting it because I am running out
of disk space - or a network outage - then I can restart the process by
using the -i option:
@@ -859,15 +859,6 @@
With 128 sockets: 0,93MB/s
</pre></ul>
-<p align=justify> The timeout option causes downloads to time out after
-a non-response from a download attempt. 30 seconds is pretty reasonable
-for many sites. You might want to increase the number of retries as
-well so that you try again and again after such timeouts.
-
-<pre><b><i>
-httrack http://www.shoesizes.com -O /tmp/shoesizes -%c20
-</i></b></pre>
-
<p align=justify> This limits the number of connections per second. It
is similar to the above option but allows the pace to be controlled
rather than the simultanaety. It is particulsrly useful for long-term
@@ -875,6 +866,15 @@
The default is 10 connections per second.
<pre><b><i>
+httrack http://www.shoesizes.com -O /tmp/shoesizes -%c20
+</i></b></pre>
+
+<p align=justify> The timeout option causes downloads to time out after
+a non-response from a download attempt. 30 seconds is pretty reasonable
+for many sites. You might want to increase the number of retries as
+well so that you try again and again after such timeouts.
+
+<pre><b><i>
httrack http://www.shoesizes.com -O /tmp/shoesizes -T30
</i></b></pre>
@@ -910,7 +910,7 @@
<p align=justify> Of course these options can be combined to provide a
powerful set of criteria for when to continue a download and when to
-give it up, how hard to push other sites. and how much to stress
+give it up, how hard to push other sites, and how much to stress
infrastructures.
<hr>
@@ -944,7 +944,7 @@
httrack http://www.shoesizes.com -O /tmp/shoesizes '%P0'
</i></b></pre>
-<p align=justify> Now here is a classic bit of cleaverness that 'does
+<p align=justify> Now here is a classic bit of cleverness that 'does
the right thing' for some cases. In this instance, we are asking
httrack to get images - like gif and jpeg files that are used by a web
page in its display, even though we would not normally get them. For
@@ -1517,7 +1517,7 @@
httrack http://www.shoesizes.com -O /tmp/shoesizes %v
</i></b></pre>
-<p align=justify> Animated information when using consol-based version,
+<p align=justify> Animated information when using console-based version,
example:
<pre>
17/95: localhost/manual/handler.html (6387 bytes) - OK
@@ -1942,7 +1942,7 @@
<p align=justify> Starting with the initially specified URLs, the
default operation mode is to mirror starting from these URLs downward
into the directory structure of the host (i.e. if one of your starting
-pagees was www.all.net/test/a.html, all links starting with www.all.net/test/
+pages was www.all.net/test/a.html, all links starting with www.all.net/test/
will be collected but links in www.all.net/anything-else will not be
collected, because they are in a higher directory strcuture level. This
prevents HTTrack from mirroring the whole site. If you may want to
@@ -2219,7 +2219,7 @@
</b></i></pre>
<p align=justify> In these cases, there is a small probability of a hash
-collision forlarge numbers of files.
+collision for large numbers of files.
<hr>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/html/httrack.man.html new/httrack-3.49.2/html/httrack.man.html
--- old/httrack-3.48.22/html/httrack.man.html 2016-04-26 19:25:40.000000000 +0200
+++ new/httrack-3.49.2/html/httrack.man.html 2017-05-20 10:42:37.000000000 +0200
@@ -1,4 +1,4 @@
-<!-- Creator : groff version 1.21 -->
+<!-- Creator : groff version 1.22.2 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html>
@@ -1560,7 +1560,7 @@
<p>maximum number of links (−#L1000000)
-(−−advanced−maxlinks)</p> </td></tr>
+(−−advanced−maxlinks[=N])</p> </td></tr>
<tr valign="top" align="left">
<td width="11%"></td>
<td width="6%">
@@ -2286,7 +2286,7 @@
<p style="margin-left:11%; margin-top: 1em">Copyright (C)
-1998-2016 Xavier Roche and other contributors</p>
+1998-2017 Xavier Roche and other contributors</p>
<p style="margin-left:11%; margin-top: 1em">This program is
free software: you can redistribute it and/or modify it
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/lang/Italiano.txt new/httrack-3.49.2/lang/Italiano.txt
--- old/httrack-3.48.22/lang/Italiano.txt 2016-04-26 19:10:23.000000000 +0200
+++ new/httrack-3.49.2/lang/Italiano.txt 2016-08-24 09:10:51.000000000 +0200
@@ -41,7 +41,7 @@
Action not yet implemented
Azione non ancora possibile
Error deleting this project
-C'� stato un errore durante l'eliminazione di questo progetto
+C'� stato un errore durante l'eliminazione di questo progetto
Select a rule for the filter
Seleziona le regole per il filtro
Enter keywords for the filter
@@ -81,7 +81,7 @@
gif\r\nWill match all GIF files
gif\r\nTrover� tutti i file gif
blue\r\nWill find all files with a matching 'blue' sub-string such as 'bluesky-small.jpeg'
-blue\r\nTrover� tutti i file contenenti blue, es. 'bluesky-small.jpeg'
+blue\r\nTrover� tutti i file contenenti 'blue', es. 'bluesky-small.jpeg'
bigfile.mov\r\nWill match the file 'bigfile.mov', but not 'bigfile2.mov'
bigfile.mov\r\nTrover� il file 'bigfile.mov', ma non 'bigfile2.mov'
cgi\r\nWill find links with folder name matching sub-string 'cgi' such as /cgi-bin/somecgi.cgi
@@ -97,7 +97,7 @@
someweb\r\nWill find any links with matching sub-string such as www.someweb.com/.., www.test.abc/fromsomeweb/index.html, www.test.abc/test/someweb.html etc.
someweb\r\nTrover� tutti i collegamenti come www.someweb.com/.., www.test.abc/fromsomeweb/index.html, www.test.abc/test/someweb.html etc.
www.test.com/test/someweb.html\r\nWill only find the 'www.test.com/test/someweb.html' file. Note that you have to type the complete path (URL + site path)
-www.test.com/test/someweb.html\r\nTrover� soltanto il collegamenti www.test.com/test/someweb.html. Notate che bisogna inserire sia l'indirizo (www.xxx.yyy), che il percorso (/test/someweb.html)
+www.test.com/test/someweb.html\r\nTrover� soltanto il collegamenti www.test.com/test/someweb.html. Nota che bisogna inserire sia l'indirizo (www.xxx.yyy), che il percorso (/test/someweb.html)
All links will match
Tutti i collegamenti verranno rifiutati/accettati
Add exclusion filter
@@ -121,7 +121,7 @@
View log files
Visualizza i file di log
Browse HTML start page
-Visualizza la pagina html iniziale
+Visualizza la pagina HTML iniziale
End of mirror
Fine del mirror
View log files
@@ -169,15 +169,15 @@
error
errore
Receiving files..
-Ricezione dei file
+Ricezione dei file..
Parsing HTML file..
Analisi file html..
Purging files..
-Pulizia file
+Pulizia file..
Loading cache in progress..
Caricamento della cache in corso...
Parsing HTML file (testing links)..
-Analisi file HTML (test dei collegamenti)
+Analisi file HTML (test dei collegamenti)..
Pause - Toggle [Mirror]/[Pause download] to resume operation
Pausa (seleziona [Aiuto]/[Pausa] per continuare)
Finishing pending transfers - Select [Cancel] to stop now!
@@ -205,7 +205,7 @@
* * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
* * MIRROR INTERROTTO! * *\r\nLa cache corrente � necessaria per le operazioni di aggiornamento e contiene solo i dati scaricati durante questa sessione interrotta.\r\nLa cache precedente potrebbe contenere informazioni pi� complete; se non vuoi perdere quelle informazioni, devi ripristinarla e cancellare la cache corrente.\r\n[Nota: per fare questo, cancella il contenuto della cartella hts-cache del mirror]\r\n\r\nPensi che la cache precedente possa contenere informazioni pi� complete e vuoi ripristinarla?
* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
-* * ERRORE NEL MIRROR! * *\r\nHTTrack ha stabilito che il mirror attuale � vuoto. Se questo � un'aggiornamento, il mirror precedente � stato ripristinato.\r\nMotivo: la prima pagina(e) non � stata trovata oppure c'� stato un problema durante la connessione\r\n=> Assicuratevi che il sito esista ancora, e/o verificate le vostre impostazioni del proxy! <=
+* * ERRORE NEL MIRROR! * *\r\nHTTrack ha stabilito che il mirror attuale � vuoto. Se questo � un aggiornamento, il mirror precedente � stato ripristinato.\r\nMotivo: la prima pagina(e) non � stata trovata oppure c'� stato un problema durante la connessione\r\n=> Assicurati che il sito esista ancora, e/o verificate le vostre impostazioni del proxy! <=
\n\nTip: Click [View log file] to see warning or error messages
\nSuggerimento: Clicca [Visualizza filr di log] per vedere i messaggi di avvertimento o di errore
Error deleting a hts-cache/new.* file, please do it manually
@@ -374,10 +374,10 @@
Crea file di log per segnalare errori e informazioni
Generate DOS 8-3 filenames ONLY
Genera solo nomi di file in formato 8.3
-Generate ISO9660 filenames ONLY for CDROM medias
+Generate ISO 9660 filenames ONLY for CDROM medias
Genera nomi di file in formato ISO9660 per i CDROM
Do not create HTML error pages
-Non generare pagine d'errore html
+Non generare pagine d'errore HTML
Select file types to be saved to disk
Seleziona i tipi di file da scrivere sul disco
Select parsing direction
@@ -399,7 +399,7 @@
Maximum number of retries on non-fatal errors
Massimo numero di tentativi nel caso di un errore non fatale
Maximum size for any single HTML file
-Massima dimensione per una pagina html
+Massima dimensione per una pagina HTML
Maximum size for any single non-HTML file
La dimensione massima per un file
Maximum amount of bytes to retrieve from the Web
@@ -417,7 +417,7 @@
Browser identity
Identit� del browser
Comment to be placed in each HTML file
-Pi� di pagina per ogni file HTML
+Pi� di pagina per ogni file HTML
Back to starting page
Torna alla pagina iniziale
Save current preferences as default values
@@ -455,13 +455,13 @@
Attempt to limit retransfers through several tricks (file size test..)
Tentativo di limitare il numero di ripetizioni dei trasferimenti, usando alcuni truchi (test della dimensione del file..)
Attempt to limit the number of links by skipping similar URLs (www.foo.com==foo.com, http=https ..)
-
+Tentativo di limitare il numero di link, saltando URL simili (www.foo.com==foo.com, http=https ..)
Write external links without login/password
Salva link esterni senza login e password
Write internal links without query string
Salva i link interni senza stringa query
Get non-HTML files related to a link, eg external .ZIP or pictures
-Scarica file non-html vicino ai collegamenti (es. .ZIP o immagini presenti all'esterno)
+Scarica file non-HTML vicino ai collegamenti (es. .ZIP o immagini presenti all'esterno)
Test all links (even forbidden ones)
Verifica tutti i collegamenti (anche quelli vietati)
Try to catch all URLs (even in unknown tags/code)
@@ -483,7 +483,7 @@
DOS names (8+3)
Nomi DOS (8+3)
ISO9660 names (CDROM)
-Nomi ISO9660 (CDROM)
+Nomi ISO 9660 (CDROM)
No error pages
Senza pagine d'errore
Primary Scan Rule
@@ -505,7 +505,7 @@
Identity
Identit�
HTML footer
-Pi� di pagina HTML
+Pi� di pagina HTML
N# connections
N� di connessioni
Abandon host if error
@@ -521,7 +521,7 @@
TimeOut(s)
TimeOut
Persistent connections (Keep-Alive)
-Connessioni persistenti (Keep-alive)
+Connessioni persistenti (keep-alive)
Reduce connection time and type lookup time using persistent connections
Riduci tempo di connessione e il tempo di verifica del tipo usando la connessione persistente
Retries
@@ -597,7 +597,7 @@
Do you really want to quit WinHTTrack Website Copier?
Vuoi veramente uscire da WinHTTrack?
Do not connect to a provider (already connected)
-non effettuare la connessione al provider (gi� connesso)
+Non effettuare la connessione al provider (gi� connesso)
Do not use remote access connection
Non usare la connessione di accesso remoto
Schedule the mirroring operation
@@ -633,7 +633,7 @@
Disconnect when finished
Disconnetti alla fine
Disconnect modem on completion
-Disconnetti il modem quando il mirror � finito
+Disconnetti il modem quando il mirror � finito
\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec(a)yahoo.fr)
\r\n(informateci degli errori o problemi)\r\n\rSviluppo:\r\nInterfacccia: Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Italian translations to:\r\nWitold Krakowski (wkrakowski(a)libero.it)
About WinHTTrack Website Copier
@@ -645,7 +645,7 @@
Your answer:
La vostra risposta:
Link detected..
-� stato trovato un collegamento
+� stato trovato un collegamento
Choose a rule
Scegli una regola
Ignore this link
@@ -721,17 +721,17 @@
Reset to default options
Azzera le opzioni di default
Load options...
-Carica le opzioni
+Carica le opzioni...
Save options as...
Salva le opzioni come...
Language preference...
-Preferenza di lingua
+Preferenza di lingua...
Contents...
-Indice
+Indice...
About WinHTTrack...
-Informazioni su WinHTTrack Website Copier
+Informazioni su WinHTTrack...
New project\tCtrl+N
-Nuovo progetto / importa...
+Nuovo progetto\tCtrl+N
&Open...\tCtrl+O
&Apri...\tCtrl+O
&Save\tCtrl+S
@@ -751,7 +751,7 @@
Proxy settings
Preferenze del proxy
Proxy address:
-L'Indirizzo del proxy
+Indirizzo del proxy
Proxy port:
Port del proxy
Authentication (only if needed)
@@ -777,9 +777,9 @@
Click here to select path
Clicca qui per selezionare il percorso
Select or create a new category name, to sort your mirrors in categories
-
+Seleziona o crea una nuova categoria
HTTrack Project Wizard...
-Wizard per progetto HTTrack
+Wizard per progetto HTTrack...
New project name:
Il nome del nuovo progetto:
Existing project name:
@@ -789,7 +789,7 @@
Base path:
Il percorso base:
Project category:
-
+Categoria del progetto:
C:\\My Web Sites
C:\\Mie pagine Web
Type a new project name, \r\nor select existing project to update/resume
@@ -837,7 +837,7 @@
Unable to save parameters!
Impossibile salvare i parametri!
Please drag only one folder at a time
-Trascina solo una cartella
+Trascina solo una cartella alla volta
Please drag only folders, not files
Trascina solo una cartella, non un file
Please drag folders only
@@ -851,7 +851,7 @@
Too manu URLs, cannot handle so many links!!
Troppi URL, il programma non pu� servire cos� tanti collegamenti!
Not enough memory, fatal internal error..
-Troppa poca memoria, grave errore interno...
+Troppa poca memoria, errore interno fatale...
Unknown operation!
Operazione sconosciuta!
Add this URL?\r\n
@@ -879,7 +879,7 @@
More information:
Pi� informazioni:
Welcome to WinHTTrack Website Copier!\n\nPlease click on the NEXT button to\n\n- start a new project\n- or resume a partial download
-Benvenuti nel WinHTTrack Website Copier\n\nClicca sul pulsante NEXT per iniziare o continuare un progetto
+Benvenuti nel WinHTTrack Website Copier!\n\nClicca sul pulsante NEXT per iniziare o continuare un progetto
File names with extension:\nFile names containing:\nThis file name:\nFolder names containing:\nThis folder name:\nLinks on this domain:\nLinks on domains containing:\nLinks from this host:\nLinks containing:\nThis link:\nALL LINKS
Tipi di file con l'estensione:\nNomi di file contenenti:\nQuesto nome di file:\nNomi di cartella contenenti:\nQuesto nome cartella:\nCollegamenti in questo dominio:\nCollegamenti nei domini contenenti:\nCollegamenti da questo host:\nCollegamenti contenenti:\nQuesto collegamento:\nTUTTI I COLLEGAMENTI
Show all\nHide debug\nHide infos\nHide debug and infos
@@ -887,7 +887,7 @@
Site-structure (default)\nHtml in web/, images/other files in web/images/\nHtml in web/html, images/other in web/images\nHtml in web/, images/other in web/\nHtml in web/, images/other in web/xxx, where xxx is the file extension\nHtml in web/html, images/other in web/xxx\nSite-structure, without www.domain.xxx/\nHtml in site_name/, images/other files in site_name/images/\nHtml in site_name/html, images/other in site_name/images\nHtml in site_name/, images/other in site_name/\nHtml in site_name/, images/other in site_name/xxx\nHtml in site_name/html, images/other in site_name/xxx\nAll files in web/, with random names (gadget !)\nAll files in site_name/, with random names (gadget !)\nUser-defined structure..
Struttura del sito (default)\nHtml nel web, immagini/altri file nel web/immagini/\nHtml nel web/html, immagini/altro nel web/immagini\nHtml nel web/, immagini/altro nel web/\nHtml nel web/, immagini/altro nel web/xxx, dove xxx � l'estensione del file\nHtml nel web/html, immagini/altro nel web/xxx\nStruttura del sito, senza www.dominio.xxx/\nHtml nel nome_del_sito/,immagini/altri file nel nome_del_sito/immagini/\nHtml nel nome_del_sito/html,immagini/altro nel nome_del file/immagini\nHtml nel nome_del_sito/,immagini/altro nel nome_del_sito/\nHtml nel nome_del_sito/,immagini/altro nel nome_del_sito/xxx\nHtml nel nome_del_sito/html,immagini/altro nel nome_del_sito/xxx\nTutti i file nel web/,con nomi casuali\nTutti i file nel nome_del_sito/,con nomi casuali\nStruttura definita dall'utente..
Just scan\nStore html files\nStore non html files\nStore all files (default)\nStore html files first
-Soltanto scanning\nSalva file html\nSalva file non-html\nSalva tutti i file (default)\nSalva prima i file html
+Soltanto scanning\nSalva file html\nSalva file non-html\nSalva tutti i file (default)\nSalva prima i file HTML
Stay in the same directory\nCan go down (default)\nCan go up\nCan both go up & down
Non uscire dalla directory\nPuoi andare gi� nella struttura (default)\nPuoi salire\nPuoi sia scendere che salire
Stay on the same address (default)\nStay on the same domain\nStay on the same top level domain\nGo everywhere on the web
@@ -901,7 +901,7 @@
Download web site(s)\nDownload web site(s) + questions\nGet individual files\nDownload all sites in pages (multiple mirror)\nTest links in pages (bookmark test)\n* Continue interrupted download\n* Update existing download
Scarica il sito(i) web\nScarica il sito(i) (con richieste)\nScarica file separati\nScarica tutti i siti nelle pagine (mirror multiplo)\nVerifica i collegamenti nelle pagine (test dei bookmark)\n* Continua un download interrotto\n* Aggiorna un download esistente
Relative URI / Absolute URL (default)\nAbsolute URL / Absolute URL\nAbsolute URI / Absolute URL\nOriginal URL / Original URL
-URL Relativo / URL Assoluto (default)\nURL Assoluto / URL Assoluto\nURL Assoluto 7 URL Assoluto\nURL Originale / URL Originale
+URL Relativo / URL Assoluto (default)\nURL Assoluto / URL Assoluto\nURL Assoluto / URL Assoluto\nURL Originale / URL Originale
Open Source offline browser
Browser offline open source
Website Copier/Offline Browser. Copy remote websites to your computer. Free.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/license.txt new/httrack-3.49.2/license.txt
--- old/httrack-3.48.22/license.txt 2016-04-26 19:25:31.000000000 +0200
+++ new/httrack-3.49.2/license.txt 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
HTTrack Website Copier License Agreement:
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/man/httrack.1 new/httrack-3.49.2/man/httrack.1
--- old/httrack-3.48.22/man/httrack.1 2016-04-26 19:24:55.000000000 +0200
+++ new/httrack-3.49.2/man/httrack.1 2017-05-20 10:42:37.000000000 +0200
@@ -1,7 +1,7 @@
.\" Process this file with
.\" groff -man -Tascii httrack.1
.\"
-.TH httrack 1 "15 March 2016" "httrack website copier"
+.TH httrack 1 "20 May 2017" "httrack website copier"
.SH NAME
httrack \- offline browser : copy websites to a local directory
.SH SYNOPSIS
@@ -439,7 +439,7 @@
.IP \-#K
scan stdin (debug) (\-\-debug\-scanstdin)
.IP \-#L
-maximum number of links (\-#L1000000) (\-\-advanced\-maxlinks)
+maximum number of links (\-#L1000000) (\-\-advanced\-maxlinks[=N])
.IP \-#p
display ugly progress information (\-\-advanced\-progressinfo)
.IP \-#P
@@ -610,7 +610,7 @@
.B <bugs(a)httrack.com>.
Include a complete, self-contained example that will allow the bug to be reproduced, and say which version of httrack you are using. Do not forget to detail options used, OS version, and any other information you deem necessary.
.SH COPYRIGHT
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/hts-indextmpl.h new/httrack-3.49.2/src/hts-indextmpl.h
--- old/httrack-3.48.22/src/hts-indextmpl.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/hts-indextmpl.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsalias.c new/httrack-3.49.2/src/htsalias.c
--- old/httrack-3.48.22/src/htsalias.c 2016-04-26 19:23:50.000000000 +0200
+++ new/httrack-3.49.2/src/htsalias.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsalias.h new/httrack-3.49.2/src/htsalias.h
--- old/httrack-3.48.22/src/htsalias.h 2016-04-26 19:23:50.000000000 +0200
+++ new/httrack-3.49.2/src/htsalias.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsarrays.h new/httrack-3.49.2/src/htsarrays.h
--- old/httrack-3.48.22/src/htsarrays.h 2016-04-26 19:23:50.000000000 +0200
+++ new/httrack-3.49.2/src/htsarrays.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsback.c new/httrack-3.49.2/src/htsback.c
--- old/httrack-3.48.22/src/htsback.c 2016-04-26 19:23:50.000000000 +0200
+++ new/httrack-3.49.2/src/htsback.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -2536,6 +2536,9 @@
// new session
back[i].r.ssl_con = SSL_new(openssl_ctx);
if (back[i].r.ssl_con) {
+ const char* hostname = jump_protocol_const(back[i].url_adr);
+ // some servers expect the hostname on the clienthello (SNI TLS extension)
+ SSL_set_tlsext_host_name(back[i].r.ssl_con, hostname);
SSL_clear(back[i].r.ssl_con);
if (SSL_set_fd(back[i].r.ssl_con, (int) back[i].r.soc) == 1) {
SSL_set_connect_state(back[i].r.ssl_con);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsback.h new/httrack-3.49.2/src/htsback.h
--- old/httrack-3.48.22/src/htsback.h 2016-04-26 19:23:50.000000000 +0200
+++ new/httrack-3.49.2/src/htsback.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsbase.h new/httrack-3.49.2/src/htsbase.h
--- old/httrack-3.48.22/src/htsbase.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsbase.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsbasenet.h new/httrack-3.49.2/src/htsbasenet.h
--- old/httrack-3.48.22/src/htsbasenet.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsbasenet.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsbauth.c new/httrack-3.49.2/src/htsbauth.c
--- old/httrack-3.48.22/src/htsbauth.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsbauth.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,6 +1,6 @@
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsbauth.h new/httrack-3.49.2/src/htsbauth.h
--- old/httrack-3.48.22/src/htsbauth.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsbauth.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htscache.c new/httrack-3.49.2/src/htscache.c
--- old/httrack-3.48.22/src/htscache.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htscache.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htscache.h new/httrack-3.49.2/src/htscache.h
--- old/httrack-3.48.22/src/htscache.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htscache.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htscatchurl.c new/httrack-3.49.2/src/htscatchurl.c
--- old/httrack-3.48.22/src/htscatchurl.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htscatchurl.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htscatchurl.h new/httrack-3.49.2/src/htscatchurl.h
--- old/httrack-3.48.22/src/htscatchurl.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htscatchurl.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htscharset.c new/httrack-3.49.2/src/htscharset.c
--- old/httrack-3.48.22/src/htscharset.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htscharset.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htscharset.h new/httrack-3.49.2/src/htscharset.h
--- old/httrack-3.48.22/src/htscharset.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htscharset.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsconfig.h new/httrack-3.49.2/src/htsconfig.h
--- old/httrack-3.48.22/src/htsconfig.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsconfig.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htscore.c new/httrack-3.49.2/src/htscore.c
--- old/httrack-3.48.22/src/htscore.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htscore.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -3993,5 +3993,5 @@
(void) a;
}
-// HTTrack Website Copier Copyright (C) 1998-2016 Xavier Roche and other contributors
+// HTTrack Website Copier Copyright (C) 1998-2017 Xavier Roche and other contributors
//
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htscore.h new/httrack-3.49.2/src/htscore.h
--- old/httrack-3.48.22/src/htscore.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htscore.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htscoremain.c new/httrack-3.49.2/src/htscoremain.c
--- old/httrack-3.48.22/src/htscoremain.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htscoremain.c 2017-05-13 15:29:34.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -2996,7 +2996,7 @@
}
}
- strcpy(n_lock,
+ strcpybuff(n_lock,
fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
"hts-in_progress.lock"));
//sprintf(n_lock,fconcat(OPT_GET_BUFF(opt), StringBuff(opt->path_log),"hts-in_progress.lock"),n);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htscoremain.h new/httrack-3.49.2/src/htscoremain.h
--- old/httrack-3.48.22/src/htscoremain.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htscoremain.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsdefines.h new/httrack-3.49.2/src/htsdefines.h
--- old/httrack-3.48.22/src/htsdefines.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsdefines.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsencoding.c new/httrack-3.49.2/src/htsencoding.c
--- old/httrack-3.48.22/src/htsencoding.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsencoding.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsencoding.h new/httrack-3.49.2/src/htsencoding.h
--- old/httrack-3.48.22/src/htsencoding.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsencoding.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsfilters.c new/httrack-3.49.2/src/htsfilters.c
--- old/httrack-3.48.22/src/htsfilters.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsfilters.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsfilters.h new/httrack-3.49.2/src/htsfilters.h
--- old/httrack-3.48.22/src/htsfilters.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsfilters.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsftp.c new/httrack-3.49.2/src/htsftp.c
--- old/httrack-3.48.22/src/htsftp.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsftp.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsftp.h new/httrack-3.49.2/src/htsftp.h
--- old/httrack-3.48.22/src/htsftp.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsftp.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsglobal.h new/httrack-3.49.2/src/htsglobal.h
--- old/httrack-3.48.22/src/htsglobal.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsglobal.h 2017-05-20 10:33:03.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -36,8 +36,8 @@
#define HTTRACK_GLOBAL_DEFH
// Version (also check external version information)
-#define HTTRACK_VERSION "3.48-22"
-#define HTTRACK_VERSIONID "3.48.22"
+#define HTTRACK_VERSION "3.49-2"
+#define HTTRACK_VERSIONID "3.49.2"
#define HTTRACK_AFF_VERSION "3.x"
#define HTTRACK_LIB_VERSION "2.0"
@@ -206,7 +206,7 @@
/* Taille max ligne de commande (>=HTS_URLMAXSIZE*2) */
#define HTS_CDLMAXSIZE 1024
-/* Copyright (C) 1998-2016 Xavier Roche and other contributors */
+/* Copyright (C) 1998-2017 Xavier Roche and other contributors */
#define HTTRACK_AFF_AUTHORS "[XR&CO'2014]"
#define HTS_DEFAULT_FOOTER "<!-- Mirrored from %s%s by HTTrack Website Copier/"HTTRACK_AFF_VERSION" "HTTRACK_AFF_AUTHORS", %s -->"
#define HTTRACK_WEB "http://www.httrack.com"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htshash.c new/httrack-3.49.2/src/htshash.c
--- old/httrack-3.48.22/src/htshash.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htshash.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htshash.h new/httrack-3.49.2/src/htshash.h
--- old/httrack-3.48.22/src/htshash.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htshash.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htshelp.c new/httrack-3.49.2/src/htshelp.c
--- old/httrack-3.48.22/src/htshelp.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htshelp.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -182,7 +182,7 @@
printf("\n");
printf("Welcome to HTTrack Website Copier (Offline Browser) " HTTRACK_VERSION
"%s\n", hts_get_version_info(opt));
- printf("Copyright (C) 1998-2016 Xavier Roche and other contributors\n");
+ printf("Copyright (C) 1998-2017 Xavier Roche and other contributors\n");
#ifdef _WIN32
printf("Note: You are running the commandline version,\n");
printf("run 'WinHTTrack.exe' to get the GUI version.\n");
@@ -795,7 +795,7 @@
sprintf(info, "HTTrack version " HTTRACK_VERSION "%s",
hts_is_available());
infomsg(info);
- infomsg("Copyright (C) 1998-2016 Xavier Roche and other contributors");
+ infomsg("Copyright (C) 1998-2017 Xavier Roche and other contributors");
#ifdef HTS_PLATFORM_NAME
infomsg("[compiled: " HTS_PLATFORM_NAME "]");
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htshelp.h new/httrack-3.49.2/src/htshelp.h
--- old/httrack-3.48.22/src/htshelp.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htshelp.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsindex.c new/httrack-3.49.2/src/htsindex.c
--- old/httrack-3.48.22/src/htsindex.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsindex.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsindex.h new/httrack-3.49.2/src/htsindex.h
--- old/httrack-3.48.22/src/htsindex.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsindex.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsjava.c new/httrack-3.49.2/src/htsjava.c
--- old/httrack-3.48.22/src/htsjava.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsjava.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsjava.h new/httrack-3.49.2/src/htsjava.h
--- old/httrack-3.48.22/src/htsjava.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsjava.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htslib.c new/httrack-3.49.2/src/htslib.c
--- old/httrack-3.48.22/src/htslib.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htslib.c 2017-04-01 22:00:27.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -68,7 +68,11 @@
#include <time.h>
#include <stdarg.h>
+#ifndef _WIN32
+#include <sys/time.h>
+#else
#include <sys/timeb.h>
+#endif
#include <fcntl.h>
// pour utimbuf
@@ -2575,11 +2579,20 @@
// number of millisec since 1970
HTSEXT_API TStamp mtime_local(void) {
#ifndef HTS_DO_NOT_USE_FTIME
- struct timeb B;
+#ifndef _WIN32
+ struct timeval tv;
+ if (gettimeofday(&tv, NULL) != 0) {
+ assert(! "gettimeofday");
+ }
+ return (TStamp) (((TStamp) tv.tv_sec * (TStamp) 1000)
+ + ((TStamp) tv.tv_usec / (TStamp) 1000000));
+#else
+ struct timeb B;
ftime(&B);
return (TStamp) (((TStamp) B.time * (TStamp) 1000)
+ ((TStamp) B.millitm));
+#endif
#else
// not precise..
return (TStamp) (((TStamp) time_local() * (TStamp) 1000)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htslib.h new/httrack-3.49.2/src/htslib.h
--- old/httrack-3.48.22/src/htslib.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htslib.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsmd5.c new/httrack-3.49.2/src/htsmd5.c
--- old/httrack-3.48.22/src/htsmd5.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsmd5.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsmd5.h new/httrack-3.49.2/src/htsmd5.h
--- old/httrack-3.48.22/src/htsmd5.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsmd5.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsmodules.c new/httrack-3.49.2/src/htsmodules.c
--- old/httrack-3.48.22/src/htsmodules.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsmodules.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsmodules.h new/httrack-3.49.2/src/htsmodules.h
--- old/httrack-3.48.22/src/htsmodules.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsmodules.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsname.c new/httrack-3.49.2/src/htsname.c
--- old/httrack-3.48.22/src/htsname.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsname.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsname.h new/httrack-3.49.2/src/htsname.h
--- old/httrack-3.48.22/src/htsname.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsname.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsnet.h new/httrack-3.49.2/src/htsnet.h
--- old/httrack-3.48.22/src/htsnet.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsnet.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsopt.h new/httrack-3.49.2/src/htsopt.h
--- old/httrack-3.48.22/src/htsopt.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsopt.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsparse.c new/httrack-3.49.2/src/htsparse.c
--- old/httrack-3.48.22/src/htsparse.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsparse.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -699,7 +699,7 @@
break;
case 1:
// And the closing comment info tag
- if ((p = strfield(html, "</html") != 0)) {
+ if ((p = strfield(html, "</html")) != 0) {
emited_footer++;
} else {
p = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsparse.h new/httrack-3.49.2/src/htsparse.h
--- old/httrack-3.48.22/src/htsparse.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsparse.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsrobots.c new/httrack-3.49.2/src/htsrobots.c
--- old/httrack-3.48.22/src/htsrobots.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsrobots.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsrobots.h new/httrack-3.49.2/src/htsrobots.h
--- old/httrack-3.48.22/src/htsrobots.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsrobots.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htssafe.h new/httrack-3.49.2/src/htssafe.h
--- old/httrack-3.48.22/src/htssafe.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htssafe.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsserver.c new/httrack-3.49.2/src/htsserver.c
--- old/httrack-3.48.22/src/htsserver.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsserver.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsserver.h new/httrack-3.49.2/src/htsserver.h
--- old/httrack-3.48.22/src/htsserver.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsserver.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsstrings.h new/httrack-3.49.2/src/htsstrings.h
--- old/httrack-3.48.22/src/htsstrings.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsstrings.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsthread.c new/httrack-3.49.2/src/htsthread.c
--- old/httrack-3.48.22/src/htsthread.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsthread.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsthread.h new/httrack-3.49.2/src/htsthread.h
--- old/httrack-3.48.22/src/htsthread.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsthread.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htstools.c new/httrack-3.49.2/src/htstools.c
--- old/httrack-3.48.22/src/htstools.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htstools.c 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htstools.h new/httrack-3.49.2/src/htstools.h
--- old/httrack-3.48.22/src/htstools.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htstools.h 2017-04-01 21:38:16.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsweb.c new/httrack-3.49.2/src/htsweb.c
--- old/httrack-3.48.22/src/htsweb.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsweb.c 2017-04-01 21:38:17.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htsweb.h new/httrack-3.49.2/src/htsweb.h
--- old/httrack-3.48.22/src/htsweb.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htsweb.h 2017-04-01 21:38:17.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htswizard.c new/httrack-3.49.2/src/htswizard.c
--- old/httrack-3.48.22/src/htswizard.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htswizard.c 2017-04-01 21:38:17.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htswizard.h new/httrack-3.49.2/src/htswizard.h
--- old/httrack-3.48.22/src/htswizard.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htswizard.h 2017-04-01 21:38:17.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htswrap.c new/httrack-3.49.2/src/htswrap.c
--- old/httrack-3.48.22/src/htswrap.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htswrap.c 2017-04-01 21:38:17.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htswrap.h new/httrack-3.49.2/src/htswrap.h
--- old/httrack-3.48.22/src/htswrap.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htswrap.h 2017-04-01 21:38:17.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htszlib.c new/httrack-3.49.2/src/htszlib.c
--- old/httrack-3.48.22/src/htszlib.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htszlib.c 2017-04-01 21:38:17.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/htszlib.h new/httrack-3.49.2/src/htszlib.h
--- old/httrack-3.48.22/src/htszlib.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/htszlib.h 2017-04-01 21:38:17.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/httrack-library.h new/httrack-3.49.2/src/httrack-library.h
--- old/httrack-3.48.22/src/httrack-library.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/httrack-library.h 2017-04-01 21:38:17.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/httrack.c new/httrack-3.49.2/src/httrack.c
--- old/httrack-3.48.22/src/httrack.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/httrack.c 2017-04-01 21:38:17.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/httrack.h new/httrack-3.49.2/src/httrack.h
--- old/httrack-3.48.22/src/httrack.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/httrack.h 2017-04-01 21:38:17.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/proxy/main.c new/httrack-3.49.2/src/proxy/main.c
--- old/httrack-3.48.22/src/proxy/main.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/proxy/main.c 2017-04-01 21:38:17.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -91,7 +91,7 @@
/* Args */
printf("ProxyTrack %s, build proxies upon HTTrack Website Copier Archives\n",
PROXYTRACK_VERSION);
- printf("Copyright (C) 1998-2016 Xavier Roche and other contributors\n");
+ printf("Copyright (C) 1998-2017 Xavier Roche and other contributors\n");
printf("\n");
printf("This program is free software: you can redistribute it and/or modify\n");
printf("it under the terms of the GNU General Public License as published by\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/proxy/proxystrings.h new/httrack-3.49.2/src/proxy/proxystrings.h
--- old/httrack-3.48.22/src/proxy/proxystrings.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/proxy/proxystrings.h 2017-04-01 21:38:17.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/proxy/proxytrack.c new/httrack-3.49.2/src/proxy/proxytrack.c
--- old/httrack-3.48.22/src/proxy/proxytrack.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/proxy/proxytrack.c 2017-04-01 21:38:17.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/proxy/proxytrack.h new/httrack-3.49.2/src/proxy/proxytrack.h
--- old/httrack-3.48.22/src/proxy/proxytrack.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/proxy/proxytrack.h 2017-04-01 21:38:17.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/proxy/store.c new/httrack-3.49.2/src/proxy/store.c
--- old/httrack-3.48.22/src/proxy/store.c 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/proxy/store.c 2017-04-01 21:38:17.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/httrack-3.48.22/src/proxy/store.h new/httrack-3.49.2/src/proxy/store.h
--- old/httrack-3.48.22/src/proxy/store.h 2016-04-26 19:23:51.000000000 +0200
+++ new/httrack-3.49.2/src/proxy/store.h 2017-04-01 21:38:17.000000000 +0200
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------ */
/*
HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2016 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
1
0
Hello community,
here is the log from the commit of package nemo-extensions for openSUSE:Factory checked in at 2018-01-01 22:31:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nemo-extensions (Old)
and /work/SRC/openSUSE:Factory/.nemo-extensions.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nemo-extensions"
Mon Jan 1 22:31:01 2018 rev:10 rq:560890 version:3.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/nemo-extensions/nemo-extensions.changes 2017-12-08 12:57:26.325575198 +0100
+++ /work/SRC/openSUSE:Factory/.nemo-extensions.new/nemo-extensions.changes 2018-01-01 22:31:04.671183367 +0100
@@ -1,0 +2,7 @@
+Sat Dec 29 14:06:45 UTC 2017 - sor.alexei(a)meowr.ru
+
+- Update pkgconfig's xreader version for 1.6.2+.
+- Add nemo-preview_xreader-versioning.patch: update versioning of
+ xreader libs and introspection in nemo-preview (commit 52767dc).
+
+-------------------------------------------------------------------
New:
----
nemo-preview_xreader-versioning.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nemo-extensions.spec ++++++
--- /var/tmp/diff_new_pack.cXhypt/_old 2018-01-01 22:31:07.254320934 +0100
+++ /var/tmp/diff_new_pack.cXhypt/_new 2018-01-01 22:31:07.258319599 +0100
@@ -36,6 +36,8 @@
Patch2: nemo-seahorse_gpg-2.2.patch
# PATCH-FIX-OPENSUSE nemo-gtkhash_openssl-1.1.patch sor.alexei(a)meowr.ru -- Add basic OpenSSL 1.1+ compatibility in nemo-gtkhash.
Patch3: nemo-gtkhash_openssl-1.1.patch
+# PATCH-FIX-UPSTREAM nemo-preview_xreader-versioning.patch miketwebster(a)gmail.com -- Update versioning of xreader libs and introspection in nemo-preview (commit 52767dc).
+Patch4: nemo-preview_xreader-versioning.patch
BuildRequires: gettext-runtime
BuildRequires: gnome-common
BuildRequires: intltool
@@ -72,8 +74,8 @@
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(pygobject-3.0)
BuildRequires: pkgconfig(webkit2gtk-4.0)
-BuildRequires: pkgconfig(xreader-document-1.5.0)
-BuildRequires: pkgconfig(xreader-view-1.5.0)
+BuildRequires: pkgconfig(xreader-document-1.5)
+BuildRequires: pkgconfig(xreader-view-1.5)
%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse})
BuildRequires: mbedtls-devel
%endif
@@ -344,6 +346,7 @@
%patch1
%patch2
%patch3
+%patch4
# Remove spurious executable permission.
chmod a-x nemo-audio-tab/COPYING.GPL3 nemo-emblems/COPYING.GPL3
++++++ nemo-preview_xreader-versioning.patch ++++++
--- nemo-preview.orig/configure.ac
+++ nemo-preview/configure.ac
@@ -69,8 +69,8 @@ PKG_CHECK_MODULES(NEMO_PREVIEW,
gstreamer-pbutils-1.0
gstreamer-tag-1.0
libmusicbrainz5
- xreader-document-1.5.0
- xreader-view-1.5.0
+ xreader-document-1.5
+ xreader-view-1.5
gtksourceview-3.0
webkit2gtk-4.0)
--- nemo-preview.orig/src/Makefile-nemo-preview.am
+++ nemo-preview/src/Makefile-nemo-preview.am
@@ -103,8 +103,8 @@ NemoPreview_1_0_gir_INCLUDES = \
GstTag-1.0 \
GdkPixbuf-2.0 \
Gtk-3.0 \
- XreaderDocument-1.5.0 \
- XreaderView-1.5.0 \
+ XreaderDocument-1.5 \
+ XreaderView-1.5 \
GtkSource-3.0
NemoPreview_1_0_gir_FILES = \
1
0
Hello community,
here is the log from the commit of package python-logzero for openSUSE:Factory checked in at 2018-01-01 22:30:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-logzero (Old)
and /work/SRC/openSUSE:Factory/.python-logzero.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-logzero"
Mon Jan 1 22:30:52 2018 rev:3 rq:560880 version:1.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-logzero/python-logzero.changes 2017-08-16 16:11:13.186387494 +0200
+++ /work/SRC/openSUSE:Factory/.python-logzero.new/python-logzero.changes 2018-01-01 22:31:01.252324823 +0100
@@ -1,0 +2,6 @@
+Fri Sep 15 09:06:58 UTC 2017 - sebix+novell.com(a)sebix.at
+
+- update to 1.3.1
+ * logzero.logfile() doc fix (#41)
+
+-------------------------------------------------------------------
Old:
----
logzero-1.3.0.tar.gz
New:
----
logzero-1.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-logzero.spec ++++++
--- /var/tmp/diff_new_pack.kuvByB/_old 2018-01-01 22:31:02.351957688 +0100
+++ /var/tmp/diff_new_pack.kuvByB/_new 2018-01-01 22:31:02.355956353 +0100
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%bcond_without test
Name: python-logzero
-Version: 1.3.0
+Version: 1.3.1
Release: 0
Summary: A logging module for Python
License: MIT
++++++ logzero-1.3.0.tar.gz -> logzero-1.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/logzero-1.3.0/PKG-INFO new/logzero-1.3.1/PKG-INFO
--- old/logzero-1.3.0/PKG-INFO 2017-07-19 14:31:43.000000000 +0200
+++ new/logzero-1.3.1/PKG-INFO 2017-09-14 11:38:45.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: logzero
-Version: 1.3.0
+Version: 1.3.1
Summary: Robust and effective logging for Python 2 and 3
Home-page: https://github.com/metachris/logzero
Author: Chris Hager
@@ -30,7 +30,7 @@
Robust and effective logging for Python 2 and 3.
- .. image:: docs/_static/logo-small.png
+ .. image:: https://raw.githubusercontent.com/metachris/logzero/master/docs/_static/log…
:alt: Logo
:width: 300px
@@ -54,7 +54,7 @@
* Heavily inspired by the `Tornado web framework`_.
- .. image:: docs/_static/demo_output.png
+ .. image:: https://raw.githubusercontent.com/metachris/logzero/master/docs/_static/dem…
:alt: Demo output in color
:width: 300px
@@ -82,6 +82,21 @@
except Exception as e:
logger.exception(e)
+
+ Adding a rotating logfile is that easy:
+
+ .. code-block:: python
+
+ import logzero
+ from logzero import logger
+
+ # Setup rotating logfile with 3 rotations, each with a maximum filesize of 1MB:
+ logzero.logfile("/tmp/rotating-logfile.log", maxBytes=1e6, backupCount=3)
+
+ # Log messages
+ logger.info("This log message goes to the console and the logfile")
+
+
Here are more examples which show how to use logfiles, custom formatters
and setting a minimum loglevel:
@@ -122,7 +137,7 @@
Installation
- =============
+ ------------
Install `logzero` with `pip`_:
@@ -130,75 +145,38 @@
$ pip install -U logzero
+ If you don't have `pip`_ installed, this `Python installation guide`_ can guide
+ you through the process.
- Changelog
- ---------
-
- See the changelog here: https://github.com/metachris/logzero/blob/master/HISTORY.rst
-
-
- Future Features & Ideas
- -----------------------
-
- * Decorator for logging function calls
- * Easier usage of custom log handlers (currently works `like this <https://logzero.readthedocs.io/en/latest/#adding-custom-handlers-eg-syslogh…>`_)
- * JSON output (a la 12 factor app)
- * Send logs to remote log collector (maybe)
- * Structured logging a la https://structlog.readthedocs.io/en/stable/index.html (maybe)
-
-
- TODO
- ----
-
- * Tests
-
- * Custom handlers and reconfiguration
- * Strange behaviour: py.test with default logger - capturing err does not work if the logger is setup initially in logzero. Only works when setup from the py script.
-
-
- Related Projects
- ----------------
-
- * https://12factor.net/logs
- * Log collectors: fluentd, logstash, etc.
- * https://structlog.readthedocs.io/en/stable/why.html
-
-
- Notes: How to release a new version
- -----------------------------------
-
- via https://cookiecutter-pypackage.readthedocs.io/en/latest/pypi_release_checkl…
+ You can also install `logzero` from the public `Github repo`_:
.. code-block:: console
- # Run the tests
- py.test
- make lint
- tox
+ $ git clone https://github.com/metachris/logzero.git
+ $ cd logzero
+ $ python setup.py install
- # Update history
- vi HISTORY.rst
- git add HISTORY.rst
- git commit -m "Changelog for upcoming release 0.1.1."
+ On openSUSE you can install the current version from repos: `python2-logzero <https://software.opensuse.org/package/python2-logzero>`_, `python3-logzero <https://software.opensuse.org/package/python3-logzero>`_. In the newest openSUSE release you can install it with zypper: `sudo zypper in python2-logzero`.
- # Update version
- bumpversion minor
-
- # Push
- git push && git push --tags
+ .. _pip: https://pip.pypa.io
+ .. _Python installation guide: http://docs.python-guide.org/en/latest/starting/installation/
+ .. _Github repo: https://github.com/metachris/logzero
- Credits
+ Changelog
---------
- This package was created with Cookiecutter_ and the `audreyr/cookiecutter-pypackage`_ project template.
+ See the changelog here: https://github.com/metachris/logzero/blob/master/HISTORY.rst
- .. _Cookiecutter: https://github.com/audreyr/cookiecutter
- .. _`audreyr/cookiecutter-pypackage`: https://github.com/audreyr/cookiecutter-pypackage
+ Feedback
+ --------
- .. _pip: https://pip.pypa.io
+ All kinds of feedback and contributions are welcome.
+ * `Create an issue <https://github.com/metachris/logzero/issues/new>`_
+ * Create a pull request
+ * `@metachris <https://twitter.com/metachris>`_ // chris(a)linuxuser.at
=======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/logzero-1.3.0/README.rst new/logzero-1.3.1/README.rst
--- old/logzero-1.3.0/README.rst 2017-07-19 14:31:28.000000000 +0200
+++ new/logzero-1.3.1/README.rst 2017-09-14 11:38:23.000000000 +0200
@@ -22,7 +22,7 @@
Robust and effective logging for Python 2 and 3.
-.. image:: docs/_static/logo-small.png
+.. image:: https://raw.githubusercontent.com/metachris/logzero/master/docs/_static/log…
:alt: Logo
:width: 300px
@@ -46,7 +46,7 @@
* Heavily inspired by the `Tornado web framework`_.
-.. image:: docs/_static/demo_output.png
+.. image:: https://raw.githubusercontent.com/metachris/logzero/master/docs/_static/dem…
:alt: Demo output in color
:width: 300px
@@ -74,6 +74,21 @@
except Exception as e:
logger.exception(e)
+
+Adding a rotating logfile is that easy:
+
+.. code-block:: python
+
+ import logzero
+ from logzero import logger
+
+ # Setup rotating logfile with 3 rotations, each with a maximum filesize of 1MB:
+ logzero.logfile("/tmp/rotating-logfile.log", maxBytes=1e6, backupCount=3)
+
+ # Log messages
+ logger.info("This log message goes to the console and the logfile")
+
+
Here are more examples which show how to use logfiles, custom formatters
and setting a minimum loglevel:
@@ -114,7 +129,7 @@
Installation
-=============
+------------
Install `logzero` with `pip`_:
@@ -122,72 +137,35 @@
$ pip install -U logzero
+If you don't have `pip`_ installed, this `Python installation guide`_ can guide
+you through the process.
-Changelog
----------
-
-See the changelog here: https://github.com/metachris/logzero/blob/master/HISTORY.rst
-
-
-Future Features & Ideas
------------------------
-
-* Decorator for logging function calls
-* Easier usage of custom log handlers (currently works `like this <https://logzero.readthedocs.io/en/latest/#adding-custom-handlers-eg-syslogh…>`_)
-* JSON output (a la 12 factor app)
-* Send logs to remote log collector (maybe)
-* Structured logging a la https://structlog.readthedocs.io/en/stable/index.html (maybe)
-
-
-TODO
-----
-
-* Tests
-
- * Custom handlers and reconfiguration
- * Strange behaviour: py.test with default logger - capturing err does not work if the logger is setup initially in logzero. Only works when setup from the py script.
-
-
-Related Projects
-----------------
-
-* https://12factor.net/logs
-* Log collectors: fluentd, logstash, etc.
-* https://structlog.readthedocs.io/en/stable/why.html
-
-
-Notes: How to release a new version
------------------------------------
-
-via https://cookiecutter-pypackage.readthedocs.io/en/latest/pypi_release_checkl…
+You can also install `logzero` from the public `Github repo`_:
.. code-block:: console
- # Run the tests
- py.test
- make lint
- tox
+ $ git clone https://github.com/metachris/logzero.git
+ $ cd logzero
+ $ python setup.py install
- # Update history
- vi HISTORY.rst
- git add HISTORY.rst
- git commit -m "Changelog for upcoming release 0.1.1."
+On openSUSE you can install the current version from repos: `python2-logzero <https://software.opensuse.org/package/python2-logzero>`_, `python3-logzero <https://software.opensuse.org/package/python3-logzero>`_. In the newest openSUSE release you can install it with zypper: `sudo zypper in python2-logzero`.
- # Update version
- bumpversion minor
-
- # Push
- git push && git push --tags
+.. _pip: https://pip.pypa.io
+.. _Python installation guide: http://docs.python-guide.org/en/latest/starting/installation/
+.. _Github repo: https://github.com/metachris/logzero
-Credits
+Changelog
---------
-This package was created with Cookiecutter_ and the `audreyr/cookiecutter-pypackage`_ project template.
+See the changelog here: https://github.com/metachris/logzero/blob/master/HISTORY.rst
-.. _Cookiecutter: https://github.com/audreyr/cookiecutter
-.. _`audreyr/cookiecutter-pypackage`: https://github.com/audreyr/cookiecutter-pypackage
+Feedback
+--------
-.. _pip: https://pip.pypa.io
+All kinds of feedback and contributions are welcome.
+* `Create an issue <https://github.com/metachris/logzero/issues/new>`_
+* Create a pull request
+* `@metachris <https://twitter.com/metachris>`_ // chris(a)linuxuser.at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/logzero-1.3.0/docs/index.rst new/logzero-1.3.1/docs/index.rst
--- old/logzero-1.3.0/docs/index.rst 2017-07-19 14:31:28.000000000 +0200
+++ new/logzero-1.3.1/docs/index.rst 2017-09-14 11:38:23.000000000 +0200
@@ -52,6 +52,9 @@
$ cd logzero
$ python setup.py install
+On openSUSE you can install the current version from repos: `python2-logzero <https://software.opensuse.org/package/python2-logzero>`_, `python3-logzero <https://software.opensuse.org/package/python3-logzero>`_.
+In the newest openSUSE release you can install it with zypper: ``sudo zypper in python2-logzero``.
+
.. _pip: https://pip.pypa.io
.. _Python installation guide: http://docs.python-guide.org/en/latest/starting/installation/
.. _Github repo: https://github.com/metachris/logzero
@@ -100,6 +103,23 @@
Exception: this is a demo exception
+Rotating Logfile
+----------------
+
+Adding a rotating logfile is that easy:
+
+.. code-block:: python
+
+ import logzero
+ from logzero import logger
+
+ # Setup rotating logfile with 3 rotations, each with a maximum filesize of 1MB:
+ logzero.logfile("/tmp/rotating-logfile.log", maxBytes=1e6, backupCount=3)
+
+ # Log messages
+ logger.info("This log message goes to the console and the logfile")
+
+
Advanced Usage Examples
-----------------------
@@ -288,7 +308,7 @@
Issues, Feedback & Contributions
================================
-All kind of feedback and contributions are welcome.
+All kinds of feedback and contributions are welcome.
* `Create an issue <https://github.com/metachris/logzero/issues/new>`_
* Create a pull request
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/logzero-1.3.0/logzero/__init__.py new/logzero-1.3.1/logzero/__init__.py
--- old/logzero-1.3.0/logzero/__init__.py 2017-07-19 14:31:28.000000000 +0200
+++ new/logzero-1.3.1/logzero/__init__.py 2017-09-14 11:38:23.000000000 +0200
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""
This helper provides a versatile yet easy to use and beautiful logging setup.
-You can use it to log to the console and optionally to a logfile. This propject
+You can use it to log to the console and optionally to a logfile. This project
is heavily inspired by the Tornado web framework.
* https://logzero.readthedocs.io
@@ -47,7 +47,7 @@
__author__ = """Chris Hager"""
__email__ = 'chris(a)linuxuser.at'
-__version__ = '1.3.0'
+__version__ = '1.3.1'
# Python 2+3 compatibility settings for logger
bytes_type = bytes
@@ -100,7 +100,7 @@
logger = setup_logger()
logger.info("hello")
- :arg string name: Name of the `Logger object <https://docs.python.org/2/library/logging.html#logger-objects>`_. Multiple calls to ``setup_logger()`` with the same name will always return a reference to the same Logger object. (defaut: ``__name__``)
+ :arg string name: Name of the `Logger object <https://docs.python.org/2/library/logging.html#logger-objects>`_. Multiple calls to ``setup_logger()`` with the same name will always return a reference to the same Logger object. (default: ``__name__``)
:arg string logfile: If set, also write logs to the specified filename.
:arg int level: Minimum `logging-level <https://docs.python.org/2/library/logging.html#logging-levels>`_ to display (default: ``logging.DEBUG``).
:arg Formatter formatter: `Python logging Formatter object <https://docs.python.org/2/library/logging.html#formatter-objects>`_ (by default uses the internal LogFormatter).
@@ -210,7 +210,7 @@
# bytestrings. This is a bit of a hacky place to do this, but
# it's worth it since the encoding errors that would otherwise
# result are so useless (and tornado is fond of using utf8-encoded
- # byte strings whereever possible).
+ # byte strings wherever possible).
record.message = _safe_unicode(message)
except Exception as e:
record.message = "Bad message (%r): %r" % (e, record.__dict__)
@@ -392,7 +392,7 @@
it is closed and renamed to app.log.1, and if files app.log.1, app.log.2, etc. exist,
then they are renamed to app.log.2, app.log.3 etc. respectively.
- :arg int filename: Filename of the logfile. Set to `None` to disable logging to the logfile.
+ :arg string filename: Filename of the logfile. Set to `None` to disable logging to the logfile.
:arg Formatter formatter: `Python logging Formatter object <https://docs.python.org/2/library/logging.html#formatter-objects>`_ (by default uses the internal LogFormatter).
:arg string mode: mode to open the file with. Defaults to ``a``
:arg int maxBytes: Size of the logfile when rollover should occur. Defaults to 0, rollover never occurs.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/logzero-1.3.0/logzero.egg-info/PKG-INFO new/logzero-1.3.1/logzero.egg-info/PKG-INFO
--- old/logzero-1.3.0/logzero.egg-info/PKG-INFO 2017-07-19 14:31:43.000000000 +0200
+++ new/logzero-1.3.1/logzero.egg-info/PKG-INFO 2017-09-14 11:38:45.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: logzero
-Version: 1.3.0
+Version: 1.3.1
Summary: Robust and effective logging for Python 2 and 3
Home-page: https://github.com/metachris/logzero
Author: Chris Hager
@@ -30,7 +30,7 @@
Robust and effective logging for Python 2 and 3.
- .. image:: docs/_static/logo-small.png
+ .. image:: https://raw.githubusercontent.com/metachris/logzero/master/docs/_static/log…
:alt: Logo
:width: 300px
@@ -54,7 +54,7 @@
* Heavily inspired by the `Tornado web framework`_.
- .. image:: docs/_static/demo_output.png
+ .. image:: https://raw.githubusercontent.com/metachris/logzero/master/docs/_static/dem…
:alt: Demo output in color
:width: 300px
@@ -82,6 +82,21 @@
except Exception as e:
logger.exception(e)
+
+ Adding a rotating logfile is that easy:
+
+ .. code-block:: python
+
+ import logzero
+ from logzero import logger
+
+ # Setup rotating logfile with 3 rotations, each with a maximum filesize of 1MB:
+ logzero.logfile("/tmp/rotating-logfile.log", maxBytes=1e6, backupCount=3)
+
+ # Log messages
+ logger.info("This log message goes to the console and the logfile")
+
+
Here are more examples which show how to use logfiles, custom formatters
and setting a minimum loglevel:
@@ -122,7 +137,7 @@
Installation
- =============
+ ------------
Install `logzero` with `pip`_:
@@ -130,75 +145,38 @@
$ pip install -U logzero
+ If you don't have `pip`_ installed, this `Python installation guide`_ can guide
+ you through the process.
- Changelog
- ---------
-
- See the changelog here: https://github.com/metachris/logzero/blob/master/HISTORY.rst
-
-
- Future Features & Ideas
- -----------------------
-
- * Decorator for logging function calls
- * Easier usage of custom log handlers (currently works `like this <https://logzero.readthedocs.io/en/latest/#adding-custom-handlers-eg-syslogh…>`_)
- * JSON output (a la 12 factor app)
- * Send logs to remote log collector (maybe)
- * Structured logging a la https://structlog.readthedocs.io/en/stable/index.html (maybe)
-
-
- TODO
- ----
-
- * Tests
-
- * Custom handlers and reconfiguration
- * Strange behaviour: py.test with default logger - capturing err does not work if the logger is setup initially in logzero. Only works when setup from the py script.
-
-
- Related Projects
- ----------------
-
- * https://12factor.net/logs
- * Log collectors: fluentd, logstash, etc.
- * https://structlog.readthedocs.io/en/stable/why.html
-
-
- Notes: How to release a new version
- -----------------------------------
-
- via https://cookiecutter-pypackage.readthedocs.io/en/latest/pypi_release_checkl…
+ You can also install `logzero` from the public `Github repo`_:
.. code-block:: console
- # Run the tests
- py.test
- make lint
- tox
+ $ git clone https://github.com/metachris/logzero.git
+ $ cd logzero
+ $ python setup.py install
- # Update history
- vi HISTORY.rst
- git add HISTORY.rst
- git commit -m "Changelog for upcoming release 0.1.1."
+ On openSUSE you can install the current version from repos: `python2-logzero <https://software.opensuse.org/package/python2-logzero>`_, `python3-logzero <https://software.opensuse.org/package/python3-logzero>`_. In the newest openSUSE release you can install it with zypper: `sudo zypper in python2-logzero`.
- # Update version
- bumpversion minor
-
- # Push
- git push && git push --tags
+ .. _pip: https://pip.pypa.io
+ .. _Python installation guide: http://docs.python-guide.org/en/latest/starting/installation/
+ .. _Github repo: https://github.com/metachris/logzero
- Credits
+ Changelog
---------
- This package was created with Cookiecutter_ and the `audreyr/cookiecutter-pypackage`_ project template.
+ See the changelog here: https://github.com/metachris/logzero/blob/master/HISTORY.rst
- .. _Cookiecutter: https://github.com/audreyr/cookiecutter
- .. _`audreyr/cookiecutter-pypackage`: https://github.com/audreyr/cookiecutter-pypackage
+ Feedback
+ --------
- .. _pip: https://pip.pypa.io
+ All kinds of feedback and contributions are welcome.
+ * `Create an issue <https://github.com/metachris/logzero/issues/new>`_
+ * Create a pull request
+ * `@metachris <https://twitter.com/metachris>`_ // chris(a)linuxuser.at
=======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/logzero-1.3.0/setup.cfg new/logzero-1.3.1/setup.cfg
--- old/logzero-1.3.0/setup.cfg 2017-07-19 14:31:43.000000000 +0200
+++ new/logzero-1.3.1/setup.cfg 2017-09-14 11:38:45.000000000 +0200
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 1.3.0
+current_version = 1.3.1
commit = True
tag = True
@@ -24,5 +24,4 @@
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/logzero-1.3.0/setup.py new/logzero-1.3.1/setup.py
--- old/logzero-1.3.0/setup.py 2017-07-19 14:31:28.000000000 +0200
+++ new/logzero-1.3.1/setup.py 2017-09-14 11:38:23.000000000 +0200
@@ -13,7 +13,7 @@
setup(
name='logzero',
- version='1.3.0',
+ version='1.3.1',
description="Robust and effective logging for Python 2 and 3",
long_description=readme + '\n\n' + history,
author="Chris Hager",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/logzero-1.3.0/tests/test_new_api.py new/logzero-1.3.1/tests/test_new_api.py
--- old/logzero-1.3.0/tests/test_new_api.py 2017-07-19 14:31:28.000000000 +0200
+++ new/logzero-1.3.1/tests/test_new_api.py 2017-09-14 11:38:23.000000000 +0200
@@ -135,7 +135,7 @@
logzero.logger.info("info1")
logzero.logger.warn("warn1")
- # If setting a loglevel with logzero.loglevel(..) it will not overrite
+ # If setting a loglevel with logzero.loglevel(..) it will not overwrite
# the custom loglevel of the file handler
logzero.loglevel(logging.INFO)
logzero.logger.info("info2")
1
0
Hello community,
here is the log from the commit of package pydf for openSUSE:Factory checked in at 2018-01-01 22:30:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pydf (Old)
and /work/SRC/openSUSE:Factory/.pydf.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pydf"
Mon Jan 1 22:30:47 2018 rev:3 rq:560870 version:12
Changes:
--------
--- /work/SRC/openSUSE:Factory/pydf/pydf.changes 2016-03-26 15:24:41.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pydf.new/pydf.changes 2018-01-01 22:30:52.807144418 +0100
@@ -1,0 +2,5 @@
+Sun Dec 31 08:46:30 UTC 2017 - mpluskal(a)suse.com
+
+- Use correct rpm group
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pydf.spec ++++++
--- /var/tmp/diff_new_pack.5zuYHW/_old 2018-01-01 22:30:53.618873406 +0100
+++ /var/tmp/diff_new_pack.5zuYHW/_new 2018-01-01 22:30:53.626870736 +0100
@@ -1,7 +1,7 @@
#
# spec file for package pydf
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
Release: 0
Summary: Fully colorized df clone written in python
License: SUSE-Public-Domain
-Group: Applications/System
+Group: System/Monitoring
Url: http://kassiopeia.juls.savba.sk/~garabik/software/pydf
Source: http://kassiopeia.juls.savba.sk/~garabik/software/pydf/pydf_%{version}.tar.…
BuildArch: noarch
@@ -33,17 +33,19 @@
%prep
%setup -q
# use python3 by default
-sed -i "s|/usr/bin/python|/usr/bin/python3|g" pydf
+sed -i "s|%{_bindir}/python|%{_bindir}/python3|g" pydf
%build
%install
-install -D -m 0755 pydf %{buildroot}%{_bindir}/pydf
-install -D -m 0644 pydfrc %{buildroot}%{_sysconfdir}/pydfrc
-install -D -m 0644 pydf.1 %{buildroot}%{_mandir}/man1/pydf.1
+install -Dpm 0755 pydf \
+ %{buildroot}%{_bindir}/pydf
+install -Dpm 0644 pydfrc \
+ %{buildroot}%{_sysconfdir}/pydfrc
+install -Dpm 0644 pydf.1 \
+ %{buildroot}%{_mandir}/man1/pydf.1
%files
-%defattr(-,root,root,-)
%doc README COPYING
%config(noreplace) %{_sysconfdir}/pydfrc
%{_bindir}/pydf
1
0
Hello community,
here is the log from the commit of package epic for openSUSE:Factory checked in at 2018-01-01 22:30:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/epic (Old)
and /work/SRC/openSUSE:Factory/.epic.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "epic"
Mon Jan 1 22:30:42 2018 rev:17 rq:560859 version:2.10.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/epic/epic.changes 2014-03-21 13:29:48.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.epic.new/epic.changes 2018-01-01 22:30:50.931770550 +0100
@@ -1,0 +2,5 @@
+Fri Dec 29 15:48:06 UTC 2017 - crrodriguez(a)opensuse.org
+
+- Update to version 2.10.6, fixes openSSL 1.1 build
+
+-------------------------------------------------------------------
Old:
----
epic4-2.10.tar.bz2
New:
----
epic4-2.10.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ epic.spec ++++++
--- /var/tmp/diff_new_pack.JeheAI/_old 2018-01-01 22:30:51.895448805 +0100
+++ /var/tmp/diff_new_pack.JeheAI/_new 2018-01-01 22:30:51.903446136 +0100
@@ -1,7 +1,7 @@
#
# spec file for package epic
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,13 +25,13 @@
Obsoletes: epic4
Obsoletes: ircii
Obsoletes: irciihlp
-Version: 2.10
+Version: 2.10.6
Release: 0
Summary: Enhanced Programmable ircII Client
License: BSD-3-Clause
Group: Productivity/Networking/IRC
Url: http://www.epicsol.org
-Source0: epic4-%version.tar.bz2
+Source0: epic4-%version.tar.gz
Source1: epic4-help-20070412.tar.bz2
Patch: epic4-config.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
1
0
Hello community,
here is the log from the commit of package geany for openSUSE:Factory checked in at 2018-01-01 22:30:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/geany (Old)
and /work/SRC/openSUSE:Factory/.geany.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geany"
Mon Jan 1 22:30:35 2018 rev:31 rq:560580 version:1.32
Changes:
--------
--- /work/SRC/openSUSE:Factory/geany/geany.changes 2017-08-28 15:33:39.117686616 +0200
+++ /work/SRC/openSUSE:Factory/.geany.new/geany.changes 2018-01-01 22:30:42.618546088 +0100
@@ -1,0 +2,51 @@
+Sat Dec 16 10:22:47 UTC 2017 - mailaender(a)opensuse.org
+
+- Update to version 1.32
+ + General:
+ - Improve CLI argument help (gh#geany/geany#1644).
+ - Keep the current tab when closing documents to the right of
+ another tab.
+ - Re-enable SIGTERM handling (gh#geany/geany#1255).
+ - Create correct path for filetype config files.
+ - Add an option to enable IME's candidate window display
+ inline.
+ - Add an option to automatically reload files changed on disk
+ + Bug fixes:
+ - Fix backward compatibility of the geometry saving setting.
+ - Close "Deleted from Disk" Infobar on Reload.
+ - Make sure GDK_MOD2_MASK is cleared when getting modifiers
+ - Use non-symlinked VTE libraries on MacOS X.
+ - Fix crash if plugin manager is opened more than once.
+ - Fix incorrect variable reference.
+ + Interface:
+ - Add "Close Documents to the Right" feature.
+ - Add an option to save/reload either window position or size,
+ but optionally not both (gh#geany/geany#1456).
+ + Editor
+ - Update Scintilla to version 3.7.5 (gh#geany/geany#1503).
+ - Improve snippet support (visual indicators and more)
+ (gh#geany/geany#1470).
+ - Push current position to navqueue before navigating back
+ (gh#geany/geany#1537).
+ + Filetypes:
+ - Add GNU assembler filetype extensions (gh#geany/geany#904).
+ - Make Python comment hash space (gh#geany/geany#1682).
+ - Add missing string and comment styles for various lexers
+ (gh#geany/geany#1502).
+ - Add missing PHP keywords, especially for PHP 7.x
+ (gh#geany/geany#1547).
+ - Python: Don't highlight sub-identifiers as keywords
+ (gh#geany/geany#1544).
+ + Plugins: FileBrowser: don't change directory on project save
+ (gh#geany/geany#1400).
+ + API
+ - Add `utils_get_real_path()` and deprecate
+ `tm_get_real_path()` (gh#geany/geany#1224).
+ - Add `geany_plugin_get_data()` (gh#geany/geany#1234).
+ - Add `keybindings_load_keyfile()` (gh#geany/geany#1430).
+ - Add `tm_tag_get_type()` (gh#geany/geany#1465).
+ + HACKING: Add note about data types and update for best
+ practices (gh#geany/geany#1282).
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
geany-1.31.tar.bz2
New:
----
geany-1.32.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ geany.spec ++++++
--- /var/tmp/diff_new_pack.znpYAB/_old 2018-01-01 22:30:43.690188298 +0100
+++ /var/tmp/diff_new_pack.znpYAB/_new 2018-01-01 22:30:43.698185628 +0100
@@ -17,7 +17,7 @@
Name: geany
-Version: 1.31
+Version: 1.32
Release: 0
Summary: GTK-based integrated development environment
License: GPL-2.0+
++++++ geany-1.31.tar.bz2 -> geany-1.32.tar.bz2 ++++++
++++ 231949 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package deepin-music-player for openSUSE:Factory checked in at 2018-01-01 22:17:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-music-player (Old)
and /work/SRC/openSUSE:Factory/.deepin-music-player.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-music-player"
Mon Jan 1 22:17:19 2018 rev:14 rq:545677 version:3.1.7.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-music-player/deepin-music-player.changes 2017-03-17 15:06:52.399079701 +0100
+++ /work/SRC/openSUSE:Factory/.deepin-music-player.new/deepin-music-player.changes 2018-01-01 22:17:28.203774815 +0100
@@ -1,0 +2,43 @@
+Fri Nov 24 08:41:32 UTC 2017 - hillwood(a)opensuse.org
+
+- Update 3.1.7.2
+ * Fix showNormal not work (bb22dc99)
+ * Fix crash when selectNext on qt 5.9 (bed9d856)
+ * Fix hidpi playing state (84783418)
+ * Fix lyric text cut (1dbf4dc2)
+ * Fix move qmediaplayer to main thread (3ce0ca3c)
+ * Fix dialog style (cfc0db93)
+ * Use deviceRatio in musicitemdelegate (f3a65085)
+ * Enable drag progress bar (22f8916e)
+ * Fix border pos (6fa9cc9e)
+ * Set dialog flag error (ef200472)
+ * Change footer bar cover mouse cursor (a4837dce)
+ * Fix libdmusic install path (2d86199a)
+ * Make dropdown show full text on ru locale (fcc58c97)
+ * Stop next after continue error count >= 5 (e6127596)
+ * Call dbus trash (b5d6fcb4)
+ * Extern footer progress (3459625e)
+ * All use svg (a942c308)
+ * Use dbus call filemanager (e276e636)
+ * Remove dtk2 workaround (0eb1ee32)
+ * Use dtk DWaterProgress (6109ffee)
+ * Add hidpi support (107e5987)
+- Drop deepin-tool-kit
+- Drop libdui
+
+-------------------------------------------------------------------
+Thu Sep 28 03:35:49 UTC 2017 - hillwood(a)opensuse.org
+
+- Fix build in armv7l.
+
+-------------------------------------------------------------------
+Wed Sep 27 09:00:49 UTC 2017 - hillwood(a)opensuse.org
+
+- Update to 3.1.6
+ * Update deepin-tool-kit
+ * Use QtAV
+ * Use dtkwidget
+ * Use libcue
+- Drop deepin-music-dui.patch, merged by upstream.
+
+-------------------------------------------------------------------
Old:
----
deepin-music-3.0.1.tar.gz
deepin-music-dui.patch
New:
----
deepin-music-3.1.7.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-music-player.spec ++++++
--- /var/tmp/diff_new_pack.wbJYuG/_old 2018-01-01 22:17:29.911204767 +0100
+++ /var/tmp/diff_new_pack.wbJYuG/_new 2018-01-01 22:17:29.915203432 +0100
@@ -18,14 +18,14 @@
Name: deepin-music-player
-Version: 3.0.1
+Version: 3.1.7.2
Release: 0
Summary: Deepin Music Player
License: GPL-3.0+
Group: Productivity/Multimedia/Sound/Players
Url: https://github.com/linuxdeepin/deepin-music
-Source0: deepin-music-%{version}.tar.gz
-Patch0: deepin-music-dui.patch
+Source0: https://github.com/linuxdeepin/deepin-music/archive/%{version}/deepin-music…
+BuildRequires: QtAV-devel
BuildRequires: fdupes
BuildRequires: hicolor-icon-theme
BuildRequires: libQt5Network-devel
@@ -36,15 +36,16 @@
BuildRequires: libqt5-qtsvg-devel
BuildRequires: libqt5-qtx11extras-devel
BuildRequires: update-desktop-files
-BuildRequires: pkgconfig(dtkbase-0-2)
-BuildRequires: pkgconfig(dtkutil-0-2)
-BuildRequires: pkgconfig(dtkwidget-0-2)
-BuildRequires: pkgconfig(dui)
+BuildRequires: pkgconfig(dtkcore)
+BuildRequires: pkgconfig(dtksettings)
+BuildRequires: pkgconfig(dtksettingsview)
+BuildRequires: pkgconfig(dtkwidget)
BuildRequires: pkgconfig(icu-i18n)
BuildRequires: pkgconfig(icu-uc)
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
+BuildRequires: pkgconfig(libcue)
BuildRequires: pkgconfig(taglib)
# produce png icons from svg
BuildRequires: rsvg-view
@@ -94,7 +95,6 @@
%package -n libdbusextended-qt5-devel
Summary: Development files for the Deepin Music Player D-Bus system
Group: Development/Libraries/C and C++
-Requires: libdbusextended-qt5-devel = %{version}
%description -n libdbusextended-qt5-devel
The libdbusextended-devel package contains the header files and developer
@@ -103,7 +103,6 @@
%package -n libmpris-qt5-devel
Summary: Development files for the Deepin Music Player MPRI library
Group: Development/Libraries/C and C++
-Requires: libmpris-qt5-1 = %{version}
%description -n libmpris-qt5-devel
The libmpris-devel package contains the header files and developer
@@ -111,8 +110,7 @@
%prep
%setup -q -n deepin-music-%{version}
-%patch0 -p1
-sed -i 's|lrelease|lrelease-qt5|g' tool/translate_generation.sh
+sed -i 's|lrelease|lrelease-qt5|g' tool/translate_generation.*
sed -i '/%1/s|lib|%{_lib}|' music-player/core/pluginmanager.cpp
sed -i '/target.path/s|lib|%{_lib}|' libdmusic/libdmusic.pro \
plugin/netease-meta-search/netease-meta-search.pro
@@ -125,24 +123,24 @@
%build
%qmake5 DEFINES+=QT_NO_DEBUG_OUTPUT \
PREFIX=%{_prefix} \
- LIB_INSTALL_DIR=%{_libdir}
+ LIB_INSTALL_DIR=%{_libdir} \
+ LIBSUFFIX=%{lib}
make %{?_smp_mflags}
%install
%qmake5_install
+%ifarch i386 i486 i586 i686 athlon armv7hl
+%else
+ mv %{buildroot}%{_libexecdir}/*.so* %{buildroot}%{_libdir}
+ mv %{buildroot}%{_libexecdir}/pkgconfig %{buildroot}%{_libdir}/pkgconfig
+ rm -rf %{buildroot}%{_libexecdir}
+%endif
+
+# Remove invalid developement files.
rm -rf %{buildroot}%{_libdir}/libdmusic.so
rm -rf %{buildroot}%{_libdir}/deepin-music/plugins/libnetease-meta-search.so
-# Fix paths in pkgconfig files
-sed -i 's|${prefix}|/usr|g' %{buildroot}%{_libdir}/pkgconfig/*.pc
-sed -i 's|${includedir}|/usr/include|g' %{buildroot}%{_libdir}/pkgconfig/*.pc
-sed -i 's|-I/usr/include|-I/usr/include/qt5/MprisQt|g' \
-%{buildroot}%{_libdir}/pkgconfig/mpris-qt5.pc
-sed -i 's|-I/usr/include|-I/usr/include/qt5/DBusExtended|g' \
-%{buildroot}%{_libdir}/pkgconfig/dbusextended-qt5.pc
-sed -i 's|-L/home/abuild/rpmbuild/BUILD/deepin-music-3.0.1/dist/lib ||g' %{buildroot}%{_libdir}/pkgconfig/mpris-qt5.pc
-
# produce png icons from svg
for i in 16 24 32 48 64 96 128 256; do
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
@@ -152,7 +150,7 @@
done
%suse_update_desktop_file -r deepin-music Player AudioVideo
-%fdupes %{buildroot}/%{_prefix}
+%fdupes %{buildroot}%{_prefix}
%post
%icon_theme_cache_postun
@@ -183,6 +181,7 @@
%{_datadir}/deepin-music
%{_datadir}/dman
%{_datadir}/icons/hicolor/*/apps/deepin-music.png
+%{_datadir}/icons/hicolor/scalable/apps/deepin-music.svg
%files -n libdmusic1
%defattr(-,root,root,-)
@@ -206,12 +205,7 @@
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/dbusextended-qt5.pc
%{_libdir}/libdbusextended-qt5.so
-%dir %{_libdir}/qt5/
-%dir %{_libdir}/qt5/mkspecs/
-%dir %{_libdir}/qt5/mkspecs/features/
-%{_libdir}/qt5/mkspecs/features/dbusextended-qt5.prf
-%dir %{_includedir}/qt5/
-%{_includedir}/qt5/DBusExtended
+%{_includedir}/DBusExtended
%files -n libmpris-qt5-devel
%defattr(-,root,root,-)
@@ -221,7 +215,6 @@
%dir %{_libdir}/qt5/mkspecs/
%dir %{_libdir}/qt5/mkspecs/features/
%{_libdir}/qt5/mkspecs/features/mpris-qt5.prf
-%dir %{_includedir}/qt5/
-%{_includedir}/qt5/MprisQt/
+%{_includedir}/MprisQt/
%changelog
++++++ deepin-music-3.0.1.tar.gz -> deepin-music-3.1.7.2.tar.gz ++++++
++++ 75709 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package gstreamer-plugins-bad for openSUSE:Factory checked in at 2018-01-01 22:10:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-bad (Old)
and /work/SRC/openSUSE:Factory/.gstreamer-plugins-bad.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gstreamer-plugins-bad"
Mon Jan 1 22:10:19 2018 rev:71 rq:560899 version:1.12.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/gstreamer-plugins-bad/gstreamer-plugins-bad.changes 2017-12-14 10:52:16.494700471 +0100
+++ /work/SRC/openSUSE:Factory/.gstreamer-plugins-bad.new/gstreamer-plugins-bad.changes 2018-01-01 22:10:36.029383827 +0100
@@ -1,0 +2,20 @@
+Fri Dec 29 19:26:46 UTC 2017 - zaitor(a)opensuse.org
+
+- Add gst-bad-player-transfer-ownership.patch: player: transfer
+ ownership of info properties (bgo#791982).
+
+-------------------------------------------------------------------
+Sat Dec 23 14:29:12 UTC 2017 - zaitor(a)opensuse.org
+
+- Add gst-bad-vtdec-destroy-create-fix.patch: vtdec: destroy and
+ create the GL context on start()/stop(). Removes a reference
+ count loop.
+- Add python3-xml BuildRequires and switch to using plain make
+ instead of make_build macro, and add conditional for
+ pkgconfig(graphene-1.0), pkgconfig(wayland-client),
+ pkgconfig(wayland-cursor), pkgconfig(wayland-egl),
+ pkgconfig(wayland-protocols) and pkgconfig(wayland-scanner)
+ BuildRequires and the .so and sub-package produced, fix build for
+ old versions of openSUSE.
+
+-------------------------------------------------------------------
New:
----
gst-bad-player-transfer-ownership.patch
gst-bad-vtdec-destroy-create-fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gstreamer-plugins-bad.spec ++++++
--- /var/tmp/diff_new_pack.EG3hI6/_old 2018-01-01 22:10:40.199991432 +0100
+++ /var/tmp/diff_new_pack.EG3hI6/_new 2018-01-01 22:10:40.203990098 +0100
@@ -33,6 +33,11 @@
Source: https://gstreamer.freedesktop.org/src/gst-plugins-bad/%{_name}-%{version}.t…
Source2: gstreamer-plugins-bad.appdata.xml
Source99: baselibs.conf
+# PATCH-FIX-UPSTREAM gst-bad-vtdec-destroy-create-fix.patch zaitor(a)opensuse.org -- vtdec: destroy and create the GL context on start()/stop()
+Patch0: gst-bad-vtdec-destroy-create-fix.patch
+# PATCH-FIX-UPSTREAM gst-bad-player-transfer-ownership.patch bgo#791982 zaitor(a)opensuse.org -- player: transfer ownership of info properties
+Patch1: gst-bad-player-transfer-ownership.patch
+
BuildRequires: Mesa-libGLESv3-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -45,6 +50,7 @@
BuildRequires: libmpcdec-devel
BuildRequires: orc >= 0.4.11
BuildRequires: python3-base
+BuildRequires: python3-xml
BuildRequires: pkgconfig(OpenEXR)
BuildRequires: pkgconfig(bluez)
BuildRequires: pkgconfig(bzip2)
@@ -102,11 +108,13 @@
BuildRequires: pkgconfig(soundtouch)
BuildRequires: pkgconfig(spandsp) >= 0.0.6
BuildRequires: pkgconfig(vdpau)
+%if 0%{?suse_version} >= 1500
BuildRequires: pkgconfig(wayland-client) >= 1.0.0
BuildRequires: pkgconfig(wayland-cursor) >= 1.0
BuildRequires: pkgconfig(wayland-egl) >= 9.0
BuildRequires: pkgconfig(wayland-protocols) >= 1.4
BuildRequires: pkgconfig(wayland-scanner) >= 1.4.0
+%endif
BuildRequires: pkgconfig(webrtc-audio-processing) >= 0.2
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcb) >= 1.10
@@ -114,7 +122,9 @@
%if 0%{?is_opensuse}
BuildRequires: libbs2b-devel
BuildRequires: pkgconfig(fluidsynth)
+%if 0%{?suse_version} >= 1500
BuildRequires: pkgconfig(graphene-1.0) >= 1.4.0
+%endif
BuildRequires: pkgconfig(libchromaprint)
BuildRequires: pkgconfig(libopenjp2)
BuildRequires: pkgconfig(openal)
@@ -263,6 +273,7 @@
videos. Its plug-in-based architecture means that new data types or
processing capabilities can be added simply by installing new plug-ins.
+%if 0%{?suse_version} >= 1500
%package -n libgstwayland-1_0-0
Summary: GStreamer Streaming-Media Framework Plug-Ins - Wayland backend
Group: System/Libraries
@@ -273,6 +284,7 @@
anything media-related,from real-time sound processing to playing
videos. Its plug-in-based architecture means that new data types or
processing capabilities can be added simply by installing new plug-ins.
+%endif
%package -n libgstcodecparsers-1_0-0
Summary: GStreamer Streaming-Media Framework Plug-Ins
@@ -358,7 +370,9 @@
Requires: libgstphotography-1_0-0 = %{version}
Requires: libgstplayer-1_0-0 = %{version}
Requires: libgsturidownloader-1_0-0 = %{version}
+%if 0%{?suse_version} >= 1500
Requires: libgstwayland-1_0-0 = %{version}
+%endif
Requires: typelib-1_0-GstBadAllocators-1_0 = %{version}
Requires: typelib-1_0-GstGL-1_0 = %{version}
Requires: typelib-1_0-GstInsertBin-1_0 = %{version}
@@ -455,7 +469,7 @@
%lang_package
%prep
-%setup -q -n %{_name}-%{version}
+%autosetup -n %{_name}-%{version} -p1
%build
export PYTHON=/usr/bin/python3
@@ -477,7 +491,7 @@
--enable-wayland \
--enable-introspection \
%{nil}
-%make_build
+make %{?_smp_mflags}
%install
%make_install
@@ -517,7 +531,9 @@
%post -n libgstphotography-1_0-0 -p /sbin/ldconfig
%post -n libgstplayer-1_0-0 -p /sbin/ldconfig
%post -n libgsturidownloader-1_0-0 -p /sbin/ldconfig
+%if 0%{?suse_version} >= 1500
%post -n libgstwayland-1_0-0 -p /sbin/ldconfig
+%endif
%postun -n libgstadaptivedemux-1_0-0 -p /sbin/ldconfig
%postun -n libgstbadallocators-1_0-0 -p /sbin/ldconfig
@@ -532,7 +548,9 @@
%postun -n libgstcodecparsers-1_0-0 -p /sbin/ldconfig
%postun -n libgstinsertbin-1_0-0 -p /sbin/ldconfig
%postun -n libgsturidownloader-1_0-0 -p /sbin/ldconfig
+%if 0%{?suse_version} >= 1500
%postun -n libgstwayland-1_0-0 -p /sbin/ldconfig
+%endif
%files
%doc COPYING COPYING.LIB
@@ -633,7 +651,9 @@
%{_libdir}/gstreamer-%{gst_branch}/libgstvideoparsersbad.so
%{_libdir}/gstreamer-%{gst_branch}/libgstvideosignal.so
%{_libdir}/gstreamer-%{gst_branch}/libgstvmnc.so
+%if 0%{?suse_version} >= 1500
%{_libdir}/gstreamer-%{gst_branch}/libgstwaylandsink.so
+%endif
%{_libdir}/gstreamer-%{gst_branch}/libgstwebrtcdsp.so
%{_libdir}/gstreamer-%{gst_branch}/libgsty4mdec.so
%{_libdir}/gstreamer-%{gst_branch}/libgstyadif.so
@@ -695,8 +715,10 @@
%files -n libgstvdpau
%{_libdir}/gstreamer-%{gst_branch}/libgstvdpau.so
+%if 0%{?suse_version} >= 1500
%files -n libgstwayland-1_0-0
%{_libdir}/libgstwayland-1.0.so.*
+%endif
%files -n typelib-1_0-GstBadAllocators-1_0
%defattr(-, root, root)
++++++ gst-bad-player-transfer-ownership.patch ++++++
>From 46897797c2ab835ca525e098f3d48db2f8a475d4 Mon Sep 17 00:00:00 2001
From: Philippe Normand <philn(a)igalia.com>
Date: Wed, 27 Dec 2017 13:08:18 +0000
Subject: player: transfer ownership of info properties
The previous code would emit GObject critical warnings when the info properties
are NULL.
https://bugzilla.gnome.org/show_bug.cgi?id=791982
---
gst-libs/gst/player/gstplayer.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/gst-libs/gst/player/gstplayer.c b/gst-libs/gst/player/gstplayer.c
index 6ee2023..d0d9f26 100644
--- a/gst-libs/gst/player/gstplayer.c
+++ b/gst-libs/gst/player/gstplayer.c
@@ -773,29 +773,25 @@ gst_player_get_property (GObject * object, guint prop_id,
}
case PROP_MEDIA_INFO:{
GstPlayerMediaInfo *media_info = gst_player_get_media_info (self);
- g_value_set_object (value, media_info);
- g_object_unref (media_info);
+ g_value_take_object (value, media_info);
break;
}
case PROP_CURRENT_AUDIO_TRACK:{
GstPlayerAudioInfo *audio_info =
gst_player_get_current_audio_track (self);
- g_value_set_object (value, audio_info);
- g_object_unref (audio_info);
+ g_value_take_object (value, audio_info);
break;
}
case PROP_CURRENT_VIDEO_TRACK:{
GstPlayerVideoInfo *video_info =
gst_player_get_current_video_track (self);
- g_value_set_object (value, video_info);
- g_object_unref (video_info);
+ g_value_take_object (value, video_info);
break;
}
case PROP_CURRENT_SUBTITLE_TRACK:{
GstPlayerSubtitleInfo *subtitle_info =
gst_player_get_current_subtitle_track (self);
- g_value_set_object (value, subtitle_info);
- g_object_unref (subtitle_info);
+ g_value_take_object (value, subtitle_info);
break;
}
case PROP_VOLUME:
--
cgit v1.1
++++++ gst-bad-vtdec-destroy-create-fix.patch ++++++
>From be5b414e3455d643bf0c6d2139ae693f66393be7 Mon Sep 17 00:00:00 2001
From: Matthew Waters <matthew(a)centricular.com>
Date: Fri, 22 Sep 2017 14:27:51 +1000
Subject: vtdec: destroy and create the GL context on start()/stop()
Removes a reference count loop
---
sys/applemedia/vtdec.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/sys/applemedia/vtdec.c b/sys/applemedia/vtdec.c
index d9c943d..57847a8 100644
--- a/sys/applemedia/vtdec.c
+++ b/sys/applemedia/vtdec.c
@@ -156,7 +156,6 @@ static void
gst_vtdec_init (GstVtdec * vtdec)
{
vtdec->reorder_queue = g_async_queue_new ();
- vtdec->ctxh = gst_gl_context_helper_new (GST_ELEMENT (vtdec));
}
void
@@ -167,7 +166,6 @@ gst_vtdec_finalize (GObject * object)
GST_DEBUG_OBJECT (vtdec, "finalize");
g_async_queue_unref (vtdec->reorder_queue);
- gst_gl_context_helper_free (vtdec->ctxh);
G_OBJECT_CLASS (gst_vtdec_parent_class)->finalize (object);
}
@@ -179,6 +177,9 @@ gst_vtdec_start (GstVideoDecoder * decoder)
GST_DEBUG_OBJECT (vtdec, "start");
+ if (!vtdec->ctxh)
+ vtdec->ctxh = gst_gl_context_helper_new (GST_ELEMENT (decoder));
+
return TRUE;
}
@@ -198,6 +199,10 @@ gst_vtdec_stop (GstVideoDecoder * decoder)
gst_video_texture_cache_free (vtdec->texture_cache);
vtdec->texture_cache = NULL;
+ if (vtdec->ctxh)
+ gst_gl_context_helper_free (vtdec->ctxh);
+ vtdec->ctxh = NULL;
+
GST_DEBUG_OBJECT (vtdec, "stop");
return TRUE;
@@ -320,6 +325,8 @@ gst_vtdec_negotiate (GstVideoDecoder * decoder)
/* call this regardless of whether caps have changed or not since a new
* local context could have become available
*/
+ if (!vtdec->ctxh)
+ vtdec->ctxh = gst_gl_context_helper_new (GST_ELEMENT (vtdec));
gst_gl_context_helper_ensure_context (vtdec->ctxh);
GST_INFO_OBJECT (vtdec, "pushing textures, context %p old context %p",
@@ -1016,6 +1023,8 @@ gst_vtdec_set_context (GstElement * element, GstContext * context)
GST_INFO_OBJECT (element, "setting context %s",
gst_context_get_context_type (context));
+ if (!vtdec->ctxh)
+ vtdec->ctxh = gst_gl_context_helper_new (element);
gst_gl_handle_set_context (element, context,
&vtdec->ctxh->display, &vtdec->ctxh->other_context);
GST_ELEMENT_CLASS (gst_vtdec_parent_class)->set_context (element, context);
--
cgit v1.1
1
0
Hello community,
here is the log from the commit of package python-urllib3 for openSUSE:Factory checked in at 2018-01-01 22:09:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-urllib3 (Old)
and /work/SRC/openSUSE:Factory/.python-urllib3.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-urllib3"
Mon Jan 1 22:09:50 2018 rev:15 rq:560898 version:1.22
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-urllib3/python-urllib3.changes 2017-10-28 14:17:35.668524482 +0200
+++ /work/SRC/openSUSE:Factory/.python-urllib3.new/python-urllib3.changes 2018-01-01 22:10:12.277313667 +0100
@@ -1,0 +2,6 @@
+Sun Dec 31 14:39:03 UTC 2017 - dimstar(a)opensuse.org
+
+- Add python-urllib3-recent-date.patch: Fix test suite, use correct
+ date (gh#shazow/urllib3#1303, boo#1074247).
+
+-------------------------------------------------------------------
New:
----
python-urllib3-recent-date.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-urllib3.spec ++++++
--- /var/tmp/diff_new_pack.6IVjYc/_old 2018-01-01 22:10:14.456586097 +0100
+++ /var/tmp/diff_new_pack.6IVjYc/_new 2018-01-01 22:10:14.460584763 +0100
@@ -32,6 +32,8 @@
Patch2: urllib3-ssl-default-context.patch
# PATCH-FIX-OPENSUSE -- do not use unsupported SSLv3 in tests
Patch3: urllib3-test-ssl-drop-sslv3.patch
+# PATCH-FIX-UPSTREAM python-urllib3-recent-date.patch gh#shazow/urllib3#1303, boo#1074247 dimstar(a)opensuse.org -- Fix test suite, use correct date
+Patch4: python-urllib3-recent-date.patch
BuildRequires: python-rpm-macros
#!BuildIgnore: python-requests
BuildRequires: %{python_module PySocks}
@@ -73,6 +75,7 @@
%if %(python3 -c "import ssl; print(hasattr(ssl,'PROTOCOL_TLSv1_2'))") == "True"
%patch3 -p1
%endif
+%patch4 -p1
%build
%python_build
++++++ python-urllib3-recent-date.patch ++++++
>From fc27a8ed4203084c97fd1260d2566255c35ca945 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar(a)opensuse.org>
Date: Sun, 31 Dec 2017 15:11:16 +0100
Subject: [PATCH] Move RECENT_DATE to 2017-06-30
The test suite expects the current date to be no more than two years in the future
of RECENT_DATE, which just serves as a reference point.
Also clarify the comment about how to update RECENT_DATE
Fixes #1303
---
urllib3/connection.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/urllib3/connection.py b/urllib3/connection.py
index 06bcbde..9ea04bb 100644
--- a/urllib3/connection.py
+++ b/urllib3/connection.py
@@ -57,9 +57,9 @@ port_by_scheme = {
}
# When updating RECENT_DATE, move it to
-# within two years of the current date, and no
-# earlier than 6 months ago.
-RECENT_DATE = datetime.date(2016, 1, 1)
+# within two years of the current date, and not
+# less than 6 months ago.
+RECENT_DATE = datetime.date(2017, 6, 30)
class DummyConnection(object):
--
2.15.1
1
0