openSUSE Commits
Threads by month
- ----- 2024 -----
- July
- June
- May
- 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
October 2018
- 1 participants
- 1996 discussions
Hello community,
here is the log from the commit of package exiv2 for openSUSE:Factory checked in at 2018-10-29 14:14:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/exiv2 (Old)
and /work/SRC/openSUSE:Factory/.exiv2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "exiv2"
Mon Oct 29 14:14:52 2018 rev:51 rq:644006 version:0.26
Changes:
--------
--- /work/SRC/openSUSE:Factory/exiv2/exiv2.changes 2018-07-07 21:57:05.411417223 +0200
+++ /work/SRC/openSUSE:Factory/.exiv2.new/exiv2.changes 2018-10-29 14:56:53.341724618 +0100
@@ -1,0 +2,6 @@
+Tue Oct 16 16:08:55 UTC 2018 - Dirk Mueller <dmueller(a)suse.com>
+
+- update to latest 0.26 branch:
+ * Fixes CVE-2018-12264, CVE-2018-12265 (bsc#1097599)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ exiv2.spec ++++++
--- /var/tmp/diff_new_pack.PRsG3X/_old 2018-10-29 14:56:54.161727631 +0100
+++ /var/tmp/diff_new_pack.PRsG3X/_new 2018-10-29 14:56:54.161727631 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
++++++ exiv2-update-to-0.26-branch.patch ++++++
++++ 1154 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/exiv2/exiv2-update-to-0.26-branch.patch
++++ and /work/SRC/openSUSE:Factory/.exiv2.new/exiv2-update-to-0.26-branch.patch
1
0
Hello community,
here is the log from the commit of package apache2 for openSUSE:Factory checked in at 2018-10-29 14:14:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache2 (Old)
and /work/SRC/openSUSE:Factory/.apache2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2"
Mon Oct 29 14:14:39 2018 rev:150 rq:643962 version:2.4.37
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2018-10-04 19:00:15.423281154 +0200
+++ /work/SRC/openSUSE:Factory/.apache2.new/apache2.changes 2018-10-29 14:56:51.245716852 +0100
@@ -1,0 +2,50 @@
+Thu Oct 18 20:41:02 UTC 2018 - Manu Maier <mmanu84(a)outlook.de>
+
+- updated to 2.4.37
+ * mod_ssl: Fix HTTP/2 failures when using OpenSSL 1.1.1. [Rainer Jung]
+ * mod_ssl: Fix crash during SSL renegotiation with OptRenegotiate set,
+ when client certificates are available from the original handshake
+ but were originally not verified and should get verified now.
+ This is a regression in 2.4.36 (unreleased). [Ruediger Pluem]
+ * mod_ssl: Correctly merge configurations that have client certificates set
+ by SSLProxyMachineCertificate{File|Path}. [Ruediger Pluem]
+- updated to 2.4.36
+ * mod_brotli, mod_deflate: Restore the separate handling of 304 Not Modified
+ responses. Regression introduced in 2.4.35.
+ * mod_proxy_scgi, mod_proxy_uwsgi: improve error handling when sending the
+ body of the response. [Jim Jagielski]
+ * mod_http2: adding defensive code for stream EOS handling, in case the request handler
+ missed to signal it the normal way (eos buckets). Addresses github issues
+ https://github.com/icing/mod_h2/issues/164, https://github.com/icing/mod_h2/issues/167
+ and https://github.com/icing/mod_h2/issues/170. [Stefan Eissing]
+ * ab: Add client certificate support. [Graham Leggett]
+ * ab: Disable printing temp key for OpenSSL before
+ version 1.0.2. SSL_get_server_tmp_key is not available
+ there. [Rainer Jung]
+ * mod_ssl: Fix a regression that the configuration settings for verify mode
+ and verify depth were taken from the frontend connection in case of
+ connections by the proxy to the backend. PR 62769. [Ruediger Pluem]
+ * MPMs: Initialize all runtime/asynchronous objects on a dedicated pool and
+ before signals handling to avoid lifetime issues on restart or shutdown.
+ PR 62658. [Yann Ylavic]
+ * mod_ssl: Add support for OpenSSL 1.1.1 and TLSv1.3. TLSv1.3 has
+ behavioural changes compared to v1.2 and earlier; client and
+ configuration changes should be expected. SSLCipherSuite is
+ enhanced for TLSv1.3 ciphers, but applies at vhost level only.
+ [Stefan Eissing, Yann Ylavic, Ruediger Pluem, Joe Orton]
+ * mod_auth_basic: Be less tolerant when parsing the credencial. Only spaces
+ should be accepted after the authorization scheme. \t are also tolerated.
+ [Christophe Jaillet]
+ * mod_proxy_hcheck: Fix issues with interval determination. PR 62318
+ [Jim Jagielski]
+ * mod_proxy_hcheck: Fix issues with TCP health checks. PR 61499
+ [Dominik Stillhard <dominik.stillhard united-security-providers.ch>]
+ * mod_proxy_hcheck: take balancer's SSLProxy* directives into account.
+ [Jim Jagielski]
+ * mod_status, mod_echo: Fix the display of client addresses.
+ They were truncated to 31 characters which is not enough for IPv6 addresses.
+ This is done by deprecating the use of the 'client' field and using
+ the new 'client64' field in worker_score.
+ PR 54848 [Bernhard Schmidt <berni birkenwald de>, Jim Jagielski]
+
+-------------------------------------------------------------------
Old:
----
httpd-2.4.35.tar.bz2
httpd-2.4.35.tar.bz2.asc
New:
----
httpd-2.4.37.tar.bz2
httpd-2.4.37.tar.bz2.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2.spec ++++++
--- /var/tmp/diff_new_pack.uBStzm/_old 2018-10-29 14:56:52.605721902 +0100
+++ /var/tmp/diff_new_pack.uBStzm/_new 2018-10-29 14:56:52.613721932 +0100
@@ -65,7 +65,7 @@
%define build_http2 0
%endif
Name: apache2
-Version: 2.4.35
+Version: 2.4.37
Release: 0
Summary: The Apache Web Server Version 2.4
License: Apache-2.0
++++++ httpd-2.4.35.tar.bz2 -> httpd-2.4.37.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/apache2/httpd-2.4.35.tar.bz2 /work/SRC/openSUSE:Factory/.apache2.new/httpd-2.4.37.tar.bz2 differ: char 11, line 1
1
0
Hello community,
here is the log from the commit of package file for openSUSE:Factory checked in at 2018-10-29 14:13:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/file (Old)
and /work/SRC/openSUSE:Factory/.file.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "file"
Mon Oct 29 14:13:59 2018 rev:110 rq:644483 version:5.35
Changes:
--------
--- /work/SRC/openSUSE:Factory/file/file.changes 2018-08-28 09:18:53.711780972 +0200
+++ /work/SRC/openSUSE:Factory/.file.new/file.changes 2018-10-29 14:56:49.449710117 +0100
@@ -1,0 +2,26 @@
+Mon Oct 22 08:07:33 UTC 2018 - Dr. Werner Fink <werner(a)suse.de>
+
+- Update to file version 5.35
+ * Add FreeBSD ELF core file support (John Baldwin)
+ * PR/30: Allow all parameter values to be set (don't treat 0 specially)
+ * handle default annotations on the softmagic match instead at the
+ end.
+ * PR/23: Recognize JSON files
+ * PR/18: file --mime-encoding should not print mime-type
+- Modify the patches
+ * file-5.16-ocloexec.patch
+ * file-5.17-option.dif
+ * file-5.19-biorad.dif
+ * file-5.19-printf.dif
+ * file-5.22-elf.dif
+ * file-5.23-endian.patch
+ * file-5.24-nitpick.dif
+ * file-secure_getenv.patch
+- Modify and rename patch file-5.34.dif which becomes file-5.35.dif
+
+-------------------------------------------------------------------
+Mon Oct 15 11:08:06 UTC 2018 - Dr. Werner Fink <werner(a)suse.de>
+
+- Update new signing key file as well
+
+-------------------------------------------------------------------
@@ -4,0 +31,9 @@
+
+-------------------------------------------------------------------
+Thu Jul 26 11:47:32 UTC 2018 - werner(a)suse.de
+
+- Update to file version 5.34
+ * Add Quad indirect offsets
+ * Enable parsing of ELF dynamic sections to handle PIE better
+- Remove upstream patch file-a642587a9c.patch
+- Rename patch file-5.33.dif which now becomes file-5.34.dif
--- /work/SRC/openSUSE:Factory/file/python-magic.changes 2018-07-14 20:13:54.450451863 +0200
+++ /work/SRC/openSUSE:Factory/.file.new/python-magic.changes 2018-10-29 14:56:49.473710208 +0100
@@ -1,0 +2,5 @@
+Thu Oct 25 06:09:52 UTC 2018 - Dr. Werner Fink <werner(a)suse.de>
+
+- Correct version of file which is now 5.35
+
+-------------------------------------------------------------------
Old:
----
file-5.33.dif
file-5.33.tar.gz
file-5.33.tar.gz.asc
file-a642587a9c.patch
New:
----
file-5.35.dif
file-5.35.tar.gz
file-5.35.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ file.spec ++++++
--- /var/tmp/diff_new_pack.scydOB/_old 2018-10-29 14:56:50.481713996 +0100
+++ /var/tmp/diff_new_pack.scydOB/_new 2018-10-29 14:56:50.485714010 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -30,7 +30,7 @@
%endif
#
# Set Version also in python-magic.spec
-Version: 5.33
+Version: 5.35
Release: 0
Summary: A Tool to Determine File Types
License: BSD-2-Clause
@@ -40,7 +40,7 @@
Source3: file-rpmlintrc
Source4: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz.asc
Source5: file.keyring
-Patch: file-5.33.dif
+Patch: file-5.35.dif
Patch1: file-5.19-misc.dif
Patch4: file-4.24-autoconf.dif
Patch5: file-5.14-tex.dif
@@ -64,8 +64,6 @@
Patch36: file-5.15-clear-invalid.patch
Patch37: file-secure_getenv.patch
Patch39: file-5.28-btrfs-image.dif
-# PATCH-FIX-USTREAM or bsc#1096974, bsc#1096984, and CVE-2018-10360 -- Avoid reading past the end of buffer
-Patch54: file-a642587a9c.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc
%global _miscdir %{_datadir}/misc
@@ -134,7 +132,6 @@
%patch36 -p1 -b .clear
%patch37 -p1 -b .getenv
%patch39 -p1 -b .btrfs
-%patch54
%patch -b .0
test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in
rm -fv src/magic.h
++++++ python-magic.spec ++++++
--- /var/tmp/diff_new_pack.scydOB/_old 2018-10-29 14:56:50.497714056 +0100
+++ /var/tmp/diff_new_pack.scydOB/_new 2018-10-29 14:56:50.501714070 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -28,7 +28,7 @@
BuildRequires: python-rpm-macros
BuildRequires: zlib-devel
Url: http://www.darwinsys.com/file/
-Version: 5.33
+Version: 5.35
Release: 0
Summary: Python module to use libmagic
License: BSD-3-Clause AND BSD-4-Clause
@@ -47,6 +47,7 @@
%prep
%{expand:%(sed -n -e '/^%%prep/,/^%%build/p' <%{_sourcedir}/file.spec | sed -e '1d' -e '$d')}
+ln -sf README.md python/README
%build
pushd python
++++++ file-4.24-autoconf.dif ++++++
--- /var/tmp/diff_new_pack.scydOB/_old 2018-10-29 14:56:50.537714205 +0100
+++ /var/tmp/diff_new_pack.scydOB/_new 2018-10-29 14:56:50.537714205 +0100
@@ -4,7 +4,7 @@
2 files changed, 8 insertions(+), 2 deletions(-)
--- doc/Makefile.am
-+++ doc/Makefile.am 2017-05-24 10:58:47.226494450 +0000
++++ doc/Makefile.am 2018-07-26 10:42:25.474794639 +0000
@@ -5,7 +5,8 @@ else
man_MAGIC = magic.4
endif
@@ -26,7 +26,7 @@
sed -e s@__CSECTION__@1@g \
-e s@__FSECTION__@${fsect}@g \
--- src/readelf.h
-+++ src/readelf.h 2017-05-24 10:58:47.226494450 +0000
++++ src/readelf.h 2018-07-26 10:44:03.744990438 +0000
@@ -34,7 +34,10 @@
#ifndef __fake_elf_h__
#define __fake_elf_h__
@@ -38,9 +38,9 @@
#include <stdint.h>
#endif
-@@ -430,4 +433,5 @@ typedef struct {
- #define AV_386_SSE4_1 0x00800000
- #define AV_386_SSE4_2 0x01000000
+@@ -542,4 +545,5 @@ typedef struct {
+ #define DF_1_STUB 0x04000000 /* Stub */
+ #define DF_1_PIE 0x08000000 /* Position Independent Executable */
+__END_DECLS
#endif
++++++ file-5.12-zip.dif ++++++
--- /var/tmp/diff_new_pack.scydOB/_old 2018-10-29 14:56:50.545714235 +0100
+++ /var/tmp/diff_new_pack.scydOB/_new 2018-10-29 14:56:50.545714235 +0100
@@ -4,7 +4,7 @@
--- magic/Magdir/archive
+++ magic/Magdir/archive 2018-06-12 14:15:56.676369965 +0000
-@@ -1020,6 +1020,25 @@
+@@ -1021,6 +1021,25 @@
!:mime application/zip
!:ext zip/cbz
0 string PK\003\004
++++++ file-5.15-clear-invalid.patch ++++++
--- /var/tmp/diff_new_pack.scydOB/_old 2018-10-29 14:56:50.557714280 +0100
+++ /var/tmp/diff_new_pack.scydOB/_new 2018-10-29 14:56:50.557714280 +0100
@@ -13,7 +13,7 @@
--- file-5.28/magic/Magdir/elf
+++ file-5.28/magic/Magdir/elf 2016-08-16 11:50:06.748513191 +0000
-@@ -56,7 +56,6 @@
+@@ -61,7 +61,6 @@
#>>>(0x38+0xcc) string >\0 of '%s'
#>>>(0x38+0x10) lelong >0 (signal %d),
>16 leshort &0xff00 processor-specific,
++++++ file-5.16-ocloexec.patch ++++++
--- /var/tmp/diff_new_pack.scydOB/_old 2018-10-29 14:56:50.569714325 +0100
+++ /var/tmp/diff_new_pack.scydOB/_new 2018-10-29 14:56:50.569714325 +0100
@@ -6,8 +6,8 @@
4 files changed, 6 insertions(+), 6 deletions(-)
--- src/apprentice.c
-+++ src/apprentice.c 2018-06-12 14:21:21.286557983 +0000
-@@ -1146,7 +1146,7 @@ load_1(struct magic_set *ms, int action,
++++ src/apprentice.c 2018-10-22 07:46:50.986423768 +0000
+@@ -1154,7 +1154,7 @@ load_1(struct magic_set *ms, int action,
ssize_t len;
struct magic_entry me;
@@ -16,7 +16,7 @@
if (f == NULL) {
if (errno != ENOENT)
file_error(ms, errno, "cannot read magic file `%s'",
-@@ -3045,7 +3045,7 @@ apprentice_map(struct magic_set *ms, con
+@@ -3061,7 +3061,7 @@ apprentice_map(struct magic_set *ms, con
if (dbname == NULL)
goto error;
@@ -25,29 +25,29 @@
goto error;
if (fstat(fd, &st) == -1) {
-@@ -3182,7 +3182,7 @@ apprentice_compile(struct magic_set *ms,
- if (dbname == NULL)
+@@ -3198,7 +3198,7 @@ apprentice_compile(struct magic_set *ms,
+ if (dbname == NULL)
goto out;
-- if ((fd = open(dbname, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644)) == -1)
-+ if ((fd = open(dbname, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY|O_CLOEXEC, 0644)) == -1)
+- if ((fd = open(dbname, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644)) == -1)
++ if ((fd = open(dbname, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY|O_CLOEXEC, 0644)) == -1)
{
file_error(ms, errno, "cannot open `%s'", dbname);
goto out;
--- src/compress.c
-+++ src/compress.c 2018-06-12 14:21:21.286557983 +0000
-@@ -396,7 +396,7 @@ file_pipe2file(struct magic_set *ms, int
- #else
++++ src/compress.c 2018-10-22 07:47:40.645502604 +0000
+@@ -423,7 +423,7 @@ file_pipe2file(struct magic_set *ms, int
{
int te;
+ int ou = umask(0);
- tfd = mkstemp(buf);
+ tfd = mkostemp(buf, O_CLOEXEC);
+ (void)umask(ou);
te = errno;
(void)unlink(buf);
- errno = te;
--- src/file.c
-+++ src/file.c 2018-06-12 14:22:13.777618129 +0000
-@@ -496,7 +496,7 @@ unwrap(struct magic_set *ms, const char
++++ src/file.c 2018-10-22 07:45:35.907816294 +0000
+@@ -499,7 +499,7 @@ unwrap(struct magic_set *ms, const char
f = stdin;
wid = 1;
} else {
@@ -57,13 +57,13 @@
return 1;
}
--- src/magic.c
-+++ src/magic.c 2018-06-12 14:21:21.286557983 +0000
-@@ -442,7 +442,7 @@ file_or_fd(struct magic_set *ms, const c
- else
- pos = lseek(fd, (off_t)0, SEEK_CUR);
- } else {
-- int flags = O_RDONLY|O_BINARY;
-+ int flags = O_RDONLY|O_BINARY|O_CLOEXEC;
- int okstat = stat(inname, &sb) == 0;
-
- if (okstat && S_ISFIFO(sb.st_mode)) {
++++ src/magic.c 2018-10-22 07:49:39.471290675 +0000
+@@ -434,7 +434,7 @@ file_or_fd(struct magic_set *ms, const c
+ _setmode(STDIN_FILENO, O_BINARY);
+ #endif
+ if (inname != NULL) {
+- int flags = O_RDONLY|O_BINARY|O_NONBLOCK;
++ int flags = O_RDONLY|O_BINARY|O_NONBLOCK|O_CLOEXEC;
+ errno = 0;
+ if ((fd = open(inname, flags)) < 0) {
+ int okstat = stat(inname, &sb) == 0;
++++++ file-5.17-option.dif ++++++
--- /var/tmp/diff_new_pack.scydOB/_old 2018-10-29 14:56:50.573714340 +0100
+++ /var/tmp/diff_new_pack.scydOB/_new 2018-10-29 14:56:50.573714340 +0100
@@ -4,7 +4,7 @@
--- src/file.c
+++ src/file.c 2018-06-12 14:16:45.847489541 +0000
-@@ -242,6 +242,8 @@ main(int argc, char *argv[])
+@@ -244,6 +244,8 @@ main(int argc, char *argv[])
flags |= MAGIC_ERROR;
break;
case 'e':
@@ -13,7 +13,7 @@
for (i = 0; i < sizeof(nv) / sizeof(nv[0]); i++)
if (strcmp(nv[i].name, optarg) == 0)
break;
-@@ -253,7 +255,7 @@ main(int argc, char *argv[])
+@@ -255,7 +257,7 @@ main(int argc, char *argv[])
break;
case 'f':
@@ -22,7 +22,7 @@
usage();
if (magic == NULL)
if ((magic = load(magicfile, flags)) == NULL)
-@@ -263,6 +265,8 @@ main(int argc, char *argv[])
+@@ -265,6 +267,8 @@ main(int argc, char *argv[])
++didsomefiles;
break;
case 'F':
@@ -31,7 +31,7 @@
separator = optarg;
break;
case 'i':
-@@ -275,6 +279,8 @@ main(int argc, char *argv[])
+@@ -277,6 +281,8 @@ main(int argc, char *argv[])
action = FILE_LIST;
break;
case 'm':
++++++ file-5.19-biorad.dif ++++++
--- /var/tmp/diff_new_pack.scydOB/_old 2018-10-29 14:56:50.581714370 +0100
+++ /var/tmp/diff_new_pack.scydOB/_new 2018-10-29 14:56:50.581714370 +0100
@@ -4,7 +4,7 @@
--- magic/Magdir/images
+++ magic/Magdir/images 2018-06-12 14:20:39.967297749 +0000
-@@ -1017,6 +1017,8 @@
+@@ -1026,6 +1026,8 @@
# http://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/b…
# Samples: http://www.loci.wisc.edu/software/sample-data
14 leshort <2
++++++ file-5.19-printf.dif ++++++
--- /var/tmp/diff_new_pack.scydOB/_old 2018-10-29 14:56:50.593714415 +0100
+++ /var/tmp/diff_new_pack.scydOB/_new 2018-10-29 14:56:50.593714415 +0100
@@ -4,7 +4,7 @@
--- src/apprentice.c
+++ src/apprentice.c 2018-06-12 14:15:19.109042630 +0000
-@@ -2411,6 +2411,12 @@ check_format_type(const char *ptr, int t
+@@ -2427,6 +2427,12 @@ check_format_type(const char *ptr, int t
ptr++;
if (*ptr == '#')
ptr++;
++++++ file-5.19-zip2.0.dif ++++++
--- /var/tmp/diff_new_pack.scydOB/_old 2018-10-29 14:56:50.609714475 +0100
+++ /var/tmp/diff_new_pack.scydOB/_new 2018-10-29 14:56:50.609714475 +0100
@@ -4,7 +4,7 @@
--- magic/Magdir/archive
+++ magic/Magdir/archive 2018-06-12 14:17:31.598670365 +0000
-@@ -1014,6 +1014,11 @@
+@@ -1015,6 +1015,11 @@
0 string PK\x07\x08PK\x03\x04 Zip multi-volume archive data, at least PKZIP v2.50 to extract
!:mime application/zip
!:ext zip/cbz
++++++ file-5.22-elf.dif ++++++
--- /var/tmp/diff_new_pack.scydOB/_old 2018-10-29 14:56:50.613714490 +0100
+++ /var/tmp/diff_new_pack.scydOB/_new 2018-10-29 14:56:50.617714505 +0100
@@ -4,7 +4,7 @@
--- src/readelf.c
+++ src/readelf.c 2018-06-12 14:14:14.054207494 +0000
-@@ -743,7 +743,7 @@ do_core_note(struct magic_set *ms, unsig
+@@ -796,7 +796,7 @@ do_core_note(struct magic_set *ms, unsig
default:
if (type == NT_PRPSINFO && *flags & FLAGS_IS_CORE) {
@@ -13,7 +13,7 @@
unsigned char c;
/*
* Extract the program name. We assume
-@@ -755,7 +755,9 @@ do_core_note(struct magic_set *ms, unsig
+@@ -808,7 +808,9 @@ do_core_note(struct magic_set *ms, unsig
* If the characters aren't all printable,
* reject it.
*/
++++++ file-5.23-endian.patch ++++++
--- /var/tmp/diff_new_pack.scydOB/_old 2018-10-29 14:56:50.625714535 +0100
+++ /var/tmp/diff_new_pack.scydOB/_new 2018-10-29 14:56:50.625714535 +0100
@@ -1,19 +1,20 @@
---
- src/apprentice.c | 70 ++++---------------------------------------------------
+ src/apprentice.c | 71 ++++---------------------------------------------------
src/cdf.c | 53 +++--------------------------------------
- 2 files changed, 10 insertions(+), 113 deletions(-)
+ 2 files changed, 10 insertions(+), 114 deletions(-)
--- src/apprentice.c
-+++ src/apprentice.c 2017-09-13 10:32:39.981204996 +0000
-@@ -54,6 +54,7 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1.
- #if defined(HAVE_LIMITS_H)
- #include <limits.h>
++++ src/apprentice.c 2018-10-22 07:53:29.562977637 +0000
+@@ -50,7 +50,7 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1.
#endif
+ #include <dirent.h>
+ #include <limits.h>
+-
+#include <byteswap.h>
- #ifndef SSIZE_MAX
- #define MAXMAGIC_SIZE ((ssize_t)0x7fffffff)
-@@ -132,9 +133,11 @@ private struct mlist *mlist_alloc(void);
+ #define EATAB {while (isascii((unsigned char) *l) && \
+ isspace((unsigned char) *l)) ++l;}
+@@ -123,9 +123,11 @@ private struct mlist *mlist_alloc(void);
private void mlist_free(struct mlist *);
private void byteswap(struct magic *, uint32_t);
private void bs1(struct magic *);
@@ -28,7 +29,7 @@
private char *mkdbname(struct magic_set *, const char *, int);
private struct magic_map *apprentice_buf(struct magic_set *, struct magic *,
size_t);
-@@ -3260,67 +3263,6 @@ byteswap(struct magic *magic, uint32_t n
+@@ -3290,67 +3292,6 @@ byteswap(struct magic *magic, uint32_t n
}
/*
@@ -38,8 +39,8 @@
-swap2(uint16_t sv)
-{
- uint16_t rv;
-- uint8_t *s = (uint8_t *)(void *)&sv;
-- uint8_t *d = (uint8_t *)(void *)&rv;
+- uint8_t *s = (uint8_t *)(void *)&sv;
+- uint8_t *d = (uint8_t *)(void *)&rv;
- d[0] = s[1];
- d[1] = s[0];
- return rv;
@@ -52,8 +53,8 @@
-swap4(uint32_t sv)
-{
- uint32_t rv;
-- uint8_t *s = (uint8_t *)(void *)&sv;
-- uint8_t *d = (uint8_t *)(void *)&rv;
+- uint8_t *s = (uint8_t *)(void *)&sv;
+- uint8_t *d = (uint8_t *)(void *)&rv;
- d[0] = s[3];
- d[1] = s[2];
- d[2] = s[1];
@@ -68,8 +69,8 @@
-swap8(uint64_t sv)
-{
- uint64_t rv;
-- uint8_t *s = (uint8_t *)(void *)&sv;
-- uint8_t *d = (uint8_t *)(void *)&rv;
+- uint8_t *s = (uint8_t *)(void *)&sv;
+- uint8_t *d = (uint8_t *)(void *)&rv;
-#if 0
- d[0] = s[3];
- d[1] = s[2];
@@ -97,16 +98,16 @@
*/
private void
--- src/cdf.c
-+++ src/cdf.c 2017-09-13 10:32:39.981204996 +0000
-@@ -50,6 +50,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.106 201
- #ifdef HAVE_LIMITS_H
++++ src/cdf.c 2018-10-22 07:54:09.366231573 +0000
+@@ -48,6 +48,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.113 201
+ #include <time.h>
+ #include <ctype.h>
#include <limits.h>
- #endif
+#include <byteswap.h>
#ifndef EFTYPE
#define EFTYPE EINVAL
-@@ -109,55 +110,9 @@ cdf_calloc(const char *file __attribute_
+@@ -113,55 +114,9 @@ cdf_calloc(const char *file __attribute_
return calloc(n, u);
}
++++++ file-5.24-nitpick.dif ++++++
--- /var/tmp/diff_new_pack.scydOB/_old 2018-10-29 14:56:50.633714565 +0100
+++ /var/tmp/diff_new_pack.scydOB/_new 2018-10-29 14:56:50.633714565 +0100
@@ -4,7 +4,7 @@
2 files changed, 10 insertions(+), 2 deletions(-)
--- src/file.c
-+++ src/file.c 2018-06-12 14:32:11.918707401 +0000
++++ src/file.c 2018-10-22 07:56:59.735038350 +0000
@@ -108,10 +108,12 @@ private const struct option long_options
#define OPT_MIME_ENCODING 5
#define OPT(shortname, longname, opt, def, doc) \
@@ -18,7 +18,7 @@
#undef OPT_LONGONLY
{0, 0, NULL, 0}
};
-@@ -646,6 +648,7 @@ docprint(const char *opts, int def)
+@@ -649,6 +651,7 @@ docprint(const char *opts, int def)
private void
help(void)
{
@@ -26,7 +26,7 @@
(void)fputs(
"Usage: file [OPTION...] [FILE...]\n"
"Determine type of FILEs.\n"
-@@ -653,11 +656,16 @@ help(void)
+@@ -656,11 +659,16 @@ help(void)
#define OPT(shortname, longname, opt, def, doc) \
fprintf(stdout, " -%c, --" longname, shortname), \
docprint(doc, def);
@@ -41,10 +41,10 @@
#undef OPT
+#undef OPT_POSIX
#undef OPT_LONGONLY
- fprintf(stdout, "\nReport bugs to http://bugs.gw.com/\n");
+ fprintf(stdout, "\nReport bugs to https://bugs.astron.com/\n");
exit(EXIT_SUCCESS);
--- src/file_opts.h
-+++ src/file_opts.h 2018-06-12 14:23:04.096699503 +0000
++++ src/file_opts.h 2018-10-22 07:55:03.281221021 +0000
@@ -36,8 +36,8 @@ OPT_LONGONLY("mime-encoding", 0, 0, "
OPT('k', "keep-going", 0, 0, " don't stop at the first match\n")
OPT('l', "list", 0, 0, " list magic strength\n")
++++++ file-5.28-btrfs-image.dif ++++++
--- /var/tmp/diff_new_pack.scydOB/_old 2018-10-29 14:56:50.645714610 +0100
+++ /var/tmp/diff_new_pack.scydOB/_new 2018-10-29 14:56:50.645714610 +0100
@@ -16,7 +16,7 @@
diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
--- a/magic/Magdir/filesystems
+++ b/magic/Magdir/filesystems
-@@ -2245,20 +2245,29 @@
+@@ -2267,20 +2267,29 @@
>>0x10060 string >\0 lockproto %s)
# Russell Coker <russell(a)coker.com.au>
++++++ file-5.33.dif -> file-5.35.dif ++++++
--- /work/SRC/openSUSE:Factory/file/file-5.33.dif 2018-07-14 20:13:54.334451569 +0200
+++ /work/SRC/openSUSE:Factory/.file.new/file-5.35.dif 2018-10-29 14:56:49.341709711 +0100
@@ -10,8 +10,8 @@
8 files changed, 312 insertions(+), 67 deletions(-)
--- magic/Magdir/elf
-+++ magic/Magdir/elf 2018-06-12 14:34:49.439837299 +0000
-@@ -129,7 +129,7 @@
++++ magic/Magdir/elf 2018-10-22 07:59:13.300535081 +0000
+@@ -133,7 +133,7 @@
>18 leshort 47 Renesas H8/300H,
>18 leshort 48 Renesas H8S,
>18 leshort 49 Renesas H8/500,
@@ -21,8 +21,8 @@
>18 leshort 52 Motorola Coldfire,
>18 leshort 53 Motorola M68HC12,
--- magic/Magdir/linux
-+++ magic/Magdir/linux 2018-06-12 14:34:49.439837299 +0000
-@@ -101,23 +101,27 @@
++++ magic/Magdir/linux 2018-10-22 07:59:13.300535081 +0000
+@@ -111,23 +111,27 @@
# and Nicolas Lichtmaier <nick(a)debian.org>
# All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29
# Linux kernel boot images (i386 arch) (Wolfram Kleff)
@@ -67,7 +67,7 @@
0 belong 0xb8c0078e Linux kernel
>0x1e3 string Loading version 1.3.79 or older
--- magic/Magdir/msad
-+++ magic/Magdir/msad 2018-06-12 14:34:49.439837299 +0000
++++ magic/Magdir/msad 2018-10-22 07:59:13.300535081 +0000
@@ -0,0 +1,5 @@
+#------------------------------------------------------------------------------
+# msad: file(1) magic for msad
@@ -75,8 +75,8 @@
+# This must precede the heuristic for raw G3 data
+4 string Standard\ Jet\ DB Microsoft Access Database
--- magic/Magdir/msdos
-+++ magic/Magdir/msdos 2018-06-12 14:34:49.439837299 +0000
-@@ -104,9 +104,9 @@
++++ magic/Magdir/msdos 2018-10-22 07:59:13.300535081 +0000
+@@ -135,9 +135,9 @@
>>>(0x3c.l+22) leshort&0x0200 >0 (stripped to external PDB)
>>>(0x3c.l+22) leshort&0x1000 >0 system file
>>>(0x3c.l+24) leshort 0x010b
@@ -88,7 +88,7 @@
# hooray, there's a DOS extender using the PE format, with a valid PE
# executable inside (which just prints a message and exits if run in win)
-@@ -473,7 +473,7 @@
+@@ -520,7 +520,7 @@
# negative offset, must not lead into PSP
>1 short <-259
# that offset must be accessible
@@ -98,7 +98,7 @@
# updated by Joerg Jenderek at Oct 2008,2015
--- magic/Makefile.am
-+++ magic/Makefile.am 2018-06-12 15:09:37.077835298 +0000
++++ magic/Makefile.am 2018-10-22 08:03:21.007892910 +0000
@@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir
MAGIC_DIR = $(top_srcdir)/magic
MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
@@ -116,7 +116,7 @@
$(MAGIC_FRAGMENT_DIR)/application \
$(MAGIC_FRAGMENT_DIR)/applix \
$(MAGIC_FRAGMENT_DIR)/apt \
-@@ -89,7 +88,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
+@@ -91,7 +90,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
$(MAGIC_FRAGMENT_DIR)/erlang \
$(MAGIC_FRAGMENT_DIR)/esri \
$(MAGIC_FRAGMENT_DIR)/fcs \
@@ -124,7 +124,7 @@
$(MAGIC_FRAGMENT_DIR)/finger \
$(MAGIC_FRAGMENT_DIR)/flash \
$(MAGIC_FRAGMENT_DIR)/flif \
-@@ -131,6 +129,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
+@@ -135,6 +133,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
$(MAGIC_FRAGMENT_DIR)/java \
$(MAGIC_FRAGMENT_DIR)/javascript \
$(MAGIC_FRAGMENT_DIR)/jpeg \
@@ -133,7 +133,7 @@
$(MAGIC_FRAGMENT_DIR)/karma \
$(MAGIC_FRAGMENT_DIR)/kde \
$(MAGIC_FRAGMENT_DIR)/keepass \
-@@ -139,7 +139,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
+@@ -144,7 +144,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
$(MAGIC_FRAGMENT_DIR)/lecter \
$(MAGIC_FRAGMENT_DIR)/lex \
$(MAGIC_FRAGMENT_DIR)/lif \
@@ -141,7 +141,7 @@
$(MAGIC_FRAGMENT_DIR)/lisp \
$(MAGIC_FRAGMENT_DIR)/llvm \
$(MAGIC_FRAGMENT_DIR)/lua \
-@@ -147,7 +146,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
+@@ -152,7 +151,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
$(MAGIC_FRAGMENT_DIR)/m4 \
$(MAGIC_FRAGMENT_DIR)/mach \
$(MAGIC_FRAGMENT_DIR)/macos \
@@ -149,7 +149,7 @@
$(MAGIC_FRAGMENT_DIR)/magic \
$(MAGIC_FRAGMENT_DIR)/mail.news \
$(MAGIC_FRAGMENT_DIR)/make \
-@@ -170,10 +168,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
+@@ -175,10 +173,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
$(MAGIC_FRAGMENT_DIR)/mkid \
$(MAGIC_FRAGMENT_DIR)/mlssa \
$(MAGIC_FRAGMENT_DIR)/mmdf \
@@ -161,7 +161,7 @@
$(MAGIC_FRAGMENT_DIR)/msooxml \
$(MAGIC_FRAGMENT_DIR)/msx \
$(MAGIC_FRAGMENT_DIR)/msvc \
-@@ -225,6 +223,8 @@ $(MAGIC_FRAGMENT_DIR)/python \
+@@ -230,6 +228,8 @@ $(MAGIC_FRAGMENT_DIR)/python \
$(MAGIC_FRAGMENT_DIR)/qt \
$(MAGIC_FRAGMENT_DIR)/revision \
$(MAGIC_FRAGMENT_DIR)/riff \
@@ -170,14 +170,14 @@
$(MAGIC_FRAGMENT_DIR)/rpi \
$(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rtf \
-@@ -301,8 +301,20 @@ $(MAGIC_FRAGMENT_DIR)/zilog \
+@@ -306,8 +306,20 @@ $(MAGIC_FRAGMENT_DIR)/zilog \
$(MAGIC_FRAGMENT_DIR)/zip \
- $(MAGIC_FRAGMENT_DIR)/zyxel
+ $(MAGIC_FRAGMENT_DIR)/zyxel
+RAW = magic
MAGIC = magic.mgc
-CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
-+CLEANFILES = ${MAGIC} $(MAGIC_DIR)/Localstuff ${RAW}
++CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff ${RAW}
+
+${RAW}: $(MAGIC_DIR)/Header $(MAGIC_DIR)/Localstuff $(EXTRA_DIST)
+ cat /dev/null > $@
@@ -192,7 +192,7 @@
# FIXME: Build file natively as well so that it can be used to compile
# the target's magic file; for now we bail if the local version does not match
-@@ -314,19 +326,22 @@ FILE_COMPILE = $(top_builddir)/src/file$
+@@ -319,19 +331,22 @@ FILE_COMPILE = $(top_builddir)/src/file$
FILE_COMPILE_DEP = $(FILE_COMPILE)
endif
@@ -232,8 +232,8 @@
+# $(FILE_COMPILE) -C -m magic
+# @rm -fr magic
--- magic/Makefile.in
-+++ magic/Makefile.in 2018-06-12 15:13:56.753087818 +0000
-@@ -237,7 +237,7 @@ top_srcdir = @top_srcdir@
++++ magic/Makefile.in 2018-10-22 08:05:13.073792870 +0000
+@@ -278,7 +278,7 @@ top_srcdir = @top_srcdir@
MAGIC_FRAGMENT_BASE = Magdir
MAGIC_DIR = $(top_srcdir)/magic
MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
@@ -242,7 +242,7 @@
EXTRA_DIST = \
$(MAGIC_DIR)/Header \
$(MAGIC_DIR)/Localstuff \
-@@ -254,7 +254,6 @@ $(MAGIC_FRAGMENT_DIR)/animation \
+@@ -295,7 +295,6 @@ $(MAGIC_FRAGMENT_DIR)/animation \
$(MAGIC_FRAGMENT_DIR)/aout \
$(MAGIC_FRAGMENT_DIR)/apache \
$(MAGIC_FRAGMENT_DIR)/apl \
@@ -250,7 +250,7 @@
$(MAGIC_FRAGMENT_DIR)/application \
$(MAGIC_FRAGMENT_DIR)/applix \
$(MAGIC_FRAGMENT_DIR)/apt \
-@@ -320,7 +319,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
+@@ -363,7 +362,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \
$(MAGIC_FRAGMENT_DIR)/erlang \
$(MAGIC_FRAGMENT_DIR)/esri \
$(MAGIC_FRAGMENT_DIR)/fcs \
@@ -258,7 +258,7 @@
$(MAGIC_FRAGMENT_DIR)/finger \
$(MAGIC_FRAGMENT_DIR)/flash \
$(MAGIC_FRAGMENT_DIR)/flif \
-@@ -362,6 +360,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
+@@ -407,6 +405,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \
$(MAGIC_FRAGMENT_DIR)/java \
$(MAGIC_FRAGMENT_DIR)/javascript \
$(MAGIC_FRAGMENT_DIR)/jpeg \
@@ -267,7 +267,7 @@
$(MAGIC_FRAGMENT_DIR)/karma \
$(MAGIC_FRAGMENT_DIR)/kde \
$(MAGIC_FRAGMENT_DIR)/keepass \
-@@ -370,7 +370,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
+@@ -416,7 +416,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \
$(MAGIC_FRAGMENT_DIR)/lecter \
$(MAGIC_FRAGMENT_DIR)/lex \
$(MAGIC_FRAGMENT_DIR)/lif \
@@ -275,7 +275,7 @@
$(MAGIC_FRAGMENT_DIR)/lisp \
$(MAGIC_FRAGMENT_DIR)/llvm \
$(MAGIC_FRAGMENT_DIR)/lua \
-@@ -378,7 +377,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
+@@ -424,7 +423,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \
$(MAGIC_FRAGMENT_DIR)/m4 \
$(MAGIC_FRAGMENT_DIR)/mach \
$(MAGIC_FRAGMENT_DIR)/macos \
@@ -283,7 +283,7 @@
$(MAGIC_FRAGMENT_DIR)/magic \
$(MAGIC_FRAGMENT_DIR)/mail.news \
$(MAGIC_FRAGMENT_DIR)/make \
-@@ -401,10 +399,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
+@@ -447,10 +445,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \
$(MAGIC_FRAGMENT_DIR)/mkid \
$(MAGIC_FRAGMENT_DIR)/mlssa \
$(MAGIC_FRAGMENT_DIR)/mmdf \
@@ -295,7 +295,7 @@
$(MAGIC_FRAGMENT_DIR)/msooxml \
$(MAGIC_FRAGMENT_DIR)/msx \
$(MAGIC_FRAGMENT_DIR)/msvc \
-@@ -456,6 +454,8 @@ $(MAGIC_FRAGMENT_DIR)/python \
+@@ -502,6 +500,8 @@ $(MAGIC_FRAGMENT_DIR)/python \
$(MAGIC_FRAGMENT_DIR)/qt \
$(MAGIC_FRAGMENT_DIR)/revision \
$(MAGIC_FRAGMENT_DIR)/riff \
@@ -304,14 +304,14 @@
$(MAGIC_FRAGMENT_DIR)/rpi \
$(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rtf \
-@@ -532,10 +532,22 @@ $(MAGIC_FRAGMENT_DIR)/zilog \
+@@ -578,10 +578,22 @@ $(MAGIC_FRAGMENT_DIR)/zilog \
$(MAGIC_FRAGMENT_DIR)/zip \
- $(MAGIC_FRAGMENT_DIR)/zyxel
+ $(MAGIC_FRAGMENT_DIR)/zyxel
+RAW = magic
MAGIC = magic.mgc
-CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
-+CLEANFILES = ${MAGIC} $(MAGIC_DIR)/Localstuff ${RAW}
++CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff ${RAW}
@IS_CROSS_COMPILE_FALSE@FILE_COMPILE = $(top_builddir)/src/file${EXEEXT}
+${RAW}: $(MAGIC_DIR)/Header $(MAGIC_DIR)/Localstuff $(EXTRA_DIST)
@@ -328,9 +328,9 @@
# FIXME: Build file natively as well so that it can be used to compile
# the target's magic file; for now we bail if the local version does not match
@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file${EXEEXT}
-@@ -756,23 +768,25 @@ uninstall-am: uninstall-pkgdataDATA
- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
- ps ps-am tags-am uninstall uninstall-am uninstall-pkgdataDATA
+@@ -803,23 +815,25 @@ uninstall-am: uninstall-pkgdataDATA
+
+ .PRECIOUS: Makefile
+${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW)
+ $(FILE_COMPILE) -C -m $(RAW)
@@ -371,7 +371,7 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--- src/Makefile.am
-+++ src/Makefile.am 2018-06-12 14:34:49.487836425 +0000
++++ src/Makefile.am 2018-10-22 07:59:13.328534557 +0000
@@ -1,4 +1,4 @@
-MAGIC = $(pkgdatadir)/magic
+MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic
@@ -379,7 +379,7 @@
nodist_include_HEADERS = magic.h
--- src/dcore.c
-+++ src/dcore.c 2018-06-12 14:34:49.487836425 +0000
++++ src/dcore.c 2018-10-22 07:59:13.344534255 +0000
@@ -0,0 +1,207 @@
+/*
+ * Show goo about ELF core files
++++++ file-5.33.tar.gz -> file-5.35.tar.gz ++++++
++++ 13030 lines of diff (skipped)
++++++ file-secure_getenv.patch ++++++
--- /var/tmp/diff_new_pack.scydOB/_old 2018-10-29 14:56:50.873715464 +0100
+++ /var/tmp/diff_new_pack.scydOB/_new 2018-10-29 14:56:50.877715479 +0100
@@ -1,24 +1,24 @@
---
- file-5.29/configure.ac | 2 ++
- file-5.29/src/file.c | 2 +-
- file-5.29/src/file.h | 8 ++++++++
- file-5.29/src/magic.c | 10 +++++-----
+ file-5.35/configure.ac | 2 ++
+ file-5.35/src/file.c | 2 +-
+ file-5.35/src/file.h | 8 ++++++++
+ file-5.35/src/magic.c | 10 +++++-----
4 files changed, 16 insertions(+), 6 deletions(-)
---- file-5.29/configure.ac
-+++ file-5.29/configure.ac 2016-11-24 09:13:33.451612426 +0000
-@@ -97,6 +97,8 @@ AC_CHECK_TYPE([sig_t],[AC_DEFINE([HAVE_S
- #include <signal.h>
- #endif])
+--- file-5.35/configure.ac
++++ file-5.35/configure.ac 2018-10-22 07:58:32.773294624 +0000
+@@ -99,6 +99,8 @@ if test "$enable_zlib" != "no"; then
+ fi
+ AC_CHECK_TYPE([sig_t],[AC_DEFINE([HAVE_SIG_T],1,[Have sig_t type])],,[#include <signal.h>])
+AC_CHECK_FUNCS([__secure_getenv secure_getenv])
+
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_OFF_T
---- file-5.29/src/file.c
-+++ file-5.29/src/file.c 2016-11-24 09:13:33.451612426 +0000
-@@ -623,7 +623,7 @@ docprint(const char *opts, int def)
+--- file-5.35/src/file.c
++++ file-5.35/src/file.c 2018-10-22 07:57:43.206223603 +0000
+@@ -651,7 +651,7 @@ docprint(const char *opts, int def)
private void
help(void)
{
@@ -27,9 +27,9 @@
(void)fputs(
"Usage: file [OPTION...] [FILE...]\n"
"Determine type of FILEs.\n"
---- file-5.29/src/file.h
-+++ file-5.29/src/file.h 2016-11-24 09:13:33.451612426 +0000
-@@ -615,4 +615,12 @@ static const char *rcsid(const char *p)
+--- file-5.35/src/file.h
++++ file-5.35/src/file.h 2018-10-22 07:57:43.206223603 +0000
+@@ -658,4 +658,12 @@ static const char *rcsid(const char *p)
#define __RCSID(a)
#endif
@@ -42,9 +42,9 @@
+#endif
+
#endif /* __file_h__ */
---- file-5.29/src/magic.c
-+++ file-5.29/src/magic.c 2016-11-24 09:13:33.451612426 +0000
-@@ -185,7 +185,7 @@ get_default_magic(void)
+--- file-5.35/src/magic.c
++++ file-5.35/src/magic.c 2018-10-22 07:57:43.206223603 +0000
+@@ -183,7 +183,7 @@ get_default_magic(void)
free(default_magic);
default_magic = NULL;
}
@@ -53,7 +53,7 @@
return MAGIC;
if (asprintf(&hmagicpath, "%s/.magic.mgc", home) < 0)
-@@ -222,16 +222,16 @@ out:
+@@ -220,16 +220,16 @@ out:
}
/* First, try to get a magic file from user-application data */
@@ -73,7 +73,7 @@
_w32_append_path(&hmagicpath, "%s%s", home, hmagic);
/* Fourth, try to get magic file relative to exe location */
-@@ -252,7 +252,7 @@ magic_getpath(const char *magicfile, int
+@@ -250,7 +250,7 @@ magic_getpath(const char *magicfile, int
if (magicfile != NULL)
return magicfile;
1
0
Hello community,
here is the log from the commit of package krb5 for openSUSE:Factory checked in at 2018-10-29 14:13:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/krb5 (Old)
and /work/SRC/openSUSE:Factory/.krb5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krb5"
Mon Oct 29 14:13:32 2018 rev:137 rq:642079 version:1.16.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/krb5/krb5-mini.changes 2018-05-10 15:44:07.592860018 +0200
+++ /work/SRC/openSUSE:Factory/.krb5.new/krb5-mini.changes 2018-10-29 14:56:48.197705382 +0100
@@ -1,0 +2,15 @@
+Tue Oct 9 20:13:24 UTC 2018 - James McDonough <jmcdonough(a)suse.com>
+
+- Upgrade to 1.16.1
+ * kdc client cert matching on client principal entry
+ * Allow ktutil addent command to ignore key version and use
+ non-default salt string.
+ * add kpropd pidfile support
+ * enable "encrypted_challenge_indicator" realm option on tickets
+ obtained using FAST encrypted challenge pre-authentication.
+ * dates through 2106 accepted
+ * KDC support for trivially renewable tickets
+ * stop caching referral and alternate cross-realm TGTs to prevent
+ duplicate credential cache entries
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/krb5/krb5.changes 2018-06-27 10:15:47.472327307 +0200
+++ /work/SRC/openSUSE:Factory/.krb5.new/krb5.changes 2018-10-29 14:56:48.217705458 +0100
@@ -1,0 +2,15 @@
+Tue Oct 9 20:00:21 UTC 2018 - James McDonough <jmcdonough(a)suse.com>
+
+- Upgrade to 1.16.1
+ * kdc client cert matching on client principal entry
+ * Allow ktutil addent command to ignore key version and use
+ non-default salt string.
+ * add kpropd pidfile support
+ * enable "encrypted_challenge_indicator" realm option on tickets
+ obtained using FAST encrypted challenge pre-authentication.
+ * dates through 2106 accepted
+ * KDC support for trivially renewable tickets
+ * stop caching referral and alternate cross-realm TGTs to prevent
+ duplicate credential cache entries
+
+-------------------------------------------------------------------
Old:
----
krb5-1.15.3.tar.gz
krb5-1.15.3.tar.gz.asc
New:
----
krb5-1.16.1.tar.gz
krb5-1.16.1.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ krb5-mini.spec ++++++
--- /var/tmp/diff_new_pack.5vcaIG/_old 2018-10-29 14:56:48.729707399 +0100
+++ /var/tmp/diff_new_pack.5vcaIG/_new 2018-10-29 14:56:48.729707399 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -21,7 +21,7 @@
%define _fillupdir /var/adm/fillup-templates
%endif
-%define srcRoot krb5-1.15.3
+%define srcRoot krb5-1.16.1
%define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/
%define krb5docdir %{_defaultdocdir}/krb5
@@ -34,7 +34,7 @@
BuildRequires: libcom_err-devel
BuildRequires: libselinux-devel
BuildRequires: ncurses-devel
-Version: 1.15.3
+Version: 1.16.1
Release: 0
Summary: MIT Kerberos5 implementation and libraries with minimal dependencies
License: MIT
@@ -52,8 +52,8 @@
Conflicts: krb5-plugin-kdb-ldap
Conflicts: krb5-plugin-preauth-pkinit
Conflicts: krb5-plugin-preauth-otp
-Source0: https://web.mit.edu/kerberos/dist/krb5/1.15/krb5-%{version}.tar.gz
-Source1: https://web.mit.edu/kerberos/dist/krb5/1.15/krb5-%{version}.tar.gz.asc
+Source0: https://web.mit.edu/kerberos/dist/krb5/1.16/krb5-%{version}.tar.gz
+Source1: https://web.mit.edu/kerberos/dist/krb5/1.16/krb5-%{version}.tar.gz.asc
Source2: krb5.keyring
Source3: vendor-files.tar.bz2
Source4: baselibs.conf
++++++ krb5.spec ++++++
--- /var/tmp/diff_new_pack.5vcaIG/_old 2018-10-29 14:56:48.741707444 +0100
+++ /var/tmp/diff_new_pack.5vcaIG/_new 2018-10-29 14:56:48.745707459 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -30,7 +30,7 @@
BuildRequires: libcom_err-devel
BuildRequires: libselinux-devel
BuildRequires: ncurses-devel
-Version: 1.15.3
+Version: 1.16.1
Release: 0
Summary: MIT Kerberos5 implementation
License: MIT
@@ -46,8 +46,8 @@
Obsoletes: krb5-64bit
%endif
Conflicts: krb5-mini
-Source0: https://web.mit.edu/kerberos/dist/krb5/1.15/krb5-%{version}.tar.gz
-Source1: https://web.mit.edu/kerberos/dist/krb5/1.15/krb5-%{version}.tar.gz.asc
+Source0: https://web.mit.edu/kerberos/dist/krb5/1.16/krb5-%{version}.tar.gz
+Source1: https://web.mit.edu/kerberos/dist/krb5/1.16/krb5-%{version}.tar.gz.asc
Source2: krb5.keyring
Source3: vendor-files.tar.bz2
Source4: baselibs.conf
++++++ krb5-1.12-selinux-label.patch ++++++
--- /var/tmp/diff_new_pack.5vcaIG/_old 2018-10-29 14:56:48.777707580 +0100
+++ /var/tmp/diff_new_pack.5vcaIG/_new 2018-10-29 14:56:48.777707580 +0100
@@ -31,9 +31,11 @@
Red Hat #273081), so switching to using them instead of matchpathcon(),
which we used earlier, is some improvement.
---- krb5-1.13.orig/src/aclocal.m4
-+++ krb5-1.13/src/aclocal.m4
-@@ -87,6 +87,7 @@ AC_SUBST_FILE(libnodeps_frag)
+Index: krb5-1.16.1/src/aclocal.m4
+===================================================================
+--- krb5-1.16.1.orig/src/aclocal.m4
++++ krb5-1.16.1/src/aclocal.m4
+@@ -89,6 +89,7 @@ AC_SUBST_FILE(libnodeps_frag)
dnl
KRB5_AC_PRAGMA_WEAK_REF
WITH_LDAP
@@ -41,7 +43,7 @@
KRB5_LIB_PARAMS
KRB5_AC_INITFINI
KRB5_AC_ENABLE_THREADS
-@@ -1738,3 +1739,51 @@ AC_SUBST(PAM_LIBS)
+@@ -1763,3 +1764,51 @@ AC_SUBST(PAM_LIBS)
AC_SUBST(PAM_MAN)
AC_SUBST(NON_PAM_MAN)
])dnl
@@ -93,9 +95,11 @@
+LIBS="$old_LIBS"
+AC_SUBST(SELINUX_LIBS)
+])dnl
---- krb5-1.13.orig/src/config/pre.in
-+++ krb5-1.13/src/config/pre.in
-@@ -174,6 +174,7 @@ LD = $(PURE) @LD@
+Index: krb5-1.16.1/src/config/pre.in
+===================================================================
+--- krb5-1.16.1.orig/src/config/pre.in
++++ krb5-1.16.1/src/config/pre.in
+@@ -177,6 +177,7 @@ LD = $(PURE) @LD@
KRB_INCLUDES = -I$(BUILDTOP)/include -I$(top_srcdir)/include
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@@ -103,7 +107,7 @@
INSTALL=@INSTALL@
INSTALL_STRIP=
-@@ -394,7 +395,7 @@ SUPPORT_LIB = -l$(SUPPORT_LIBNAME)
+@@ -399,7 +400,7 @@ SUPPORT_LIB = -l$(SUPPORT_LIBNAME)
# HESIOD_LIBS is -lhesiod...
HESIOD_LIBS = @HESIOD_LIBS@
@@ -111,10 +115,12 @@
+KRB5_BASE_LIBS = $(KRB5_LIB) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) $(GEN_LIB) $(LIBS) $(SELINUX_LIBS) $(DL_LIB)
KDB5_LIBS = $(KDB5_LIB) $(GSSRPC_LIBS)
GSS_LIBS = $(GSS_KRB5_LIB)
- # needs fixing if ever used on Mac OS X!
---- krb5-1.13.orig/src/configure.in
-+++ krb5-1.13/src/configure.in
-@@ -1287,6 +1287,8 @@ AC_PATH_PROG(GROFF, groff)
+ # needs fixing if ever used on macOS!
+Index: krb5-1.16.1/src/configure.in
+===================================================================
+--- krb5-1.16.1.orig/src/configure.in
++++ krb5-1.16.1/src/configure.in
+@@ -1308,6 +1308,8 @@ AC_PATH_PROG(GROFF, groff)
KRB5_WITH_PAM
@@ -123,9 +129,11 @@
# Make localedir work in autoconf 2.5x.
if test "${localedir+set}" != set; then
localedir='$(datadir)/locale'
---- krb5-1.13.orig/src/include/k5-int.h
-+++ krb5-1.13/src/include/k5-int.h
-@@ -127,6 +127,7 @@ typedef unsigned char u_char;
+Index: krb5-1.16.1/src/include/k5-int.h
+===================================================================
+--- krb5-1.16.1.orig/src/include/k5-int.h
++++ krb5-1.16.1/src/include/k5-int.h
+@@ -126,6 +126,7 @@ typedef unsigned char u_char;
#endif /* HAVE_SYS_TYPES_H */
#endif /* KRB5_SYSTYPES__ */
@@ -133,8 +141,10 @@
#include "k5-platform.h"
+Index: krb5-1.16.1/src/include/k5-label.h
+===================================================================
--- /dev/null
-+++ krb5-1.13/src/include/k5-label.h
++++ krb5-1.16.1/src/include/k5-label.h
@@ -0,0 +1,32 @@
+#ifndef _KRB5_LABEL_H
+#define _KRB5_LABEL_H
@@ -168,8 +178,10 @@
+#define THREEPARAMOPEN(x,y,z) open(x,y,z)
+#endif
+#endif
---- krb5-1.13.orig/src/include/krb5/krb5.hin
-+++ krb5-1.13/src/include/krb5/krb5.hin
+Index: krb5-1.16.1/src/include/krb5/krb5.hin
+===================================================================
+--- krb5-1.16.1.orig/src/include/krb5/krb5.hin
++++ krb5-1.16.1/src/include/krb5/krb5.hin
@@ -87,6 +87,12 @@
#define THREEPARAMOPEN(x,y,z) open(x,y,z)
#endif
@@ -183,8 +195,10 @@
#define KRB5_OLD_CRYPTO
#include <stdlib.h>
---- krb5-1.13.orig/src/kadmin/dbutil/dump.c
-+++ krb5-1.13/src/kadmin/dbutil/dump.c
+Index: krb5-1.16.1/src/kadmin/dbutil/dump.c
+===================================================================
+--- krb5-1.16.1.orig/src/kadmin/dbutil/dump.c
++++ krb5-1.16.1/src/kadmin/dbutil/dump.c
@@ -148,12 +148,21 @@ create_ofile(char *ofile, char **tmpname
{
int fd = -1;
@@ -216,8 +230,10 @@
if (*fd == -1) {
com_err(progname, errno, _("while creating 'ok' file, '%s'"), file_ok);
exit_status++;
---- krb5-1.13.orig/src/build-tools/krb5-config.in
-+++ krb5-1.13/src/build-tools/krb5-config.in
+Index: krb5-1.16.1/src/build-tools/krb5-config.in
+===================================================================
+--- krb5-1.16.1.orig/src/build-tools/krb5-config.in
++++ krb5-1.16.1/src/build-tools/krb5-config.in
@@ -41,6 +41,7 @@ DL_LIB='@DL_LIB@'
DEFCCNAME='@DEFCCNAME@'
DEFKTNAME='@DEFKTNAME@'
@@ -235,9 +251,11 @@
# here.
echo $lib_flags
---- krb5-1.15.orig/src/lib/kadm5/logger.c 2016-12-01 23:31:24.000000000 +0100
-+++ krb5-1.15/src/lib/kadm5/logger.c 2016-12-03 21:08:16.107101435 +0100
-@@ -414,7 +414,7 @@
+Index: krb5-1.16.1/src/lib/kadm5/logger.c
+===================================================================
+--- krb5-1.16.1.orig/src/lib/kadm5/logger.c
++++ krb5-1.16.1/src/lib/kadm5/logger.c
+@@ -414,7 +414,7 @@ krb5_klog_init(krb5_context kcontext, ch
*/
append = (cp[4] == ':') ? O_APPEND : 0;
if (append || cp[4] == '=') {
@@ -246,7 +264,7 @@
S_IRUSR | S_IWUSR | S_IRGRP);
if (fd != -1)
f = fdopen(fd, append ? "a" : "w");
-@@ -918,7 +918,7 @@
+@@ -918,7 +918,7 @@ krb5_klog_reopen(krb5_context kcontext)
* In case the old logfile did not get moved out of the
* way, open for append to prevent squashing the old logs.
*/
@@ -255,9 +273,11 @@
if (f) {
set_cloexec_file(f);
log_control.log_entries[lindex].lfu_filep = f;
---- krb5-1.15.orig/src/lib/krb5/keytab/kt_file.c 2016-12-01 23:31:25.000000000 +0100
-+++ krb5-1.15/src/lib/krb5/keytab/kt_file.c 2016-12-03 17:33:05.520679326 +0100
-@@ -1022,14 +1022,14 @@
+Index: krb5-1.16.1/src/lib/krb5/keytab/kt_file.c
+===================================================================
+--- krb5-1.16.1.orig/src/lib/krb5/keytab/kt_file.c
++++ krb5-1.16.1/src/lib/krb5/keytab/kt_file.c
+@@ -1024,14 +1024,14 @@ krb5_ktfileint_open(krb5_context context
KTCHECKLOCK(id);
errno = 0;
@@ -274,9 +294,11 @@
if (!KTFILEP(id))
goto report_errno;
writevno = 1;
---- krb5-1.15.orig/src/plugins/kdb/db2/adb_openclose.c 2016-12-01 23:31:25.000000000 +0100
-+++ krb5-1.15/src/plugins/kdb/db2/adb_openclose.c 2016-12-03 17:34:40.565150626 +0100
-@@ -152,7 +152,7 @@
+Index: krb5-1.16.1/src/plugins/kdb/db2/adb_openclose.c
+===================================================================
+--- krb5-1.16.1.orig/src/plugins/kdb/db2/adb_openclose.c
++++ krb5-1.16.1/src/plugins/kdb/db2/adb_openclose.c
+@@ -152,7 +152,7 @@ osa_adb_init_db(osa_adb_db_t *dbp, char
* needs be open read/write so that write locking can work with
* POSIX systems
*/
@@ -285,8 +307,10 @@
/*
* maybe someone took away write permission so we could only
* get shared locks?
---- krb5-1.13.orig/src/plugins/kdb/db2/libdb2/btree/bt_open.c
-+++ krb5-1.13/src/plugins/kdb/db2/libdb2/btree/bt_open.c
+Index: krb5-1.16.1/src/plugins/kdb/db2/libdb2/btree/bt_open.c
+===================================================================
+--- krb5-1.16.1.orig/src/plugins/kdb/db2/libdb2/btree/bt_open.c
++++ krb5-1.16.1/src/plugins/kdb/db2/libdb2/btree/bt_open.c
@@ -60,6 +60,7 @@ static char sccsid[] = "@(#)bt_open.c 8.
#include <string.h>
#include <unistd.h>
@@ -304,8 +328,10 @@
goto err;
} else {
---- krb5-1.13.orig/src/plugins/kdb/db2/libdb2/hash/hash.c
-+++ krb5-1.13/src/plugins/kdb/db2/libdb2/hash/hash.c
+Index: krb5-1.16.1/src/plugins/kdb/db2/libdb2/hash/hash.c
+===================================================================
+--- krb5-1.16.1.orig/src/plugins/kdb/db2/libdb2/hash/hash.c
++++ krb5-1.16.1/src/plugins/kdb/db2/libdb2/hash/hash.c
@@ -51,6 +51,7 @@ static char sccsid[] = "@(#)hash.c 8.12
#include <assert.h>
#endif
@@ -314,7 +340,7 @@
#include "db-int.h"
#include "hash.h"
#include "page.h"
-@@ -140,7 +141,7 @@ __kdb2_hash_open(file, flags, mode, info
+@@ -129,7 +130,7 @@ __kdb2_hash_open(file, flags, mode, info
new_table = 1;
}
if (file) {
@@ -323,9 +349,11 @@
RETURN_ERROR(errno, error0);
(void)fcntl(hashp->fp, F_SETFD, 1);
}
---- krb5-1.13.orig/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c
-+++ krb5-1.13/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c
-@@ -178,7 +178,7 @@ done:
+Index: krb5-1.16.1/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c
+===================================================================
+--- krb5-1.16.1.orig/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c
++++ krb5-1.16.1/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c
+@@ -203,7 +203,7 @@ kdb5_ldap_stash_service_password(int arg
/* set password in the file */
old_mode = umask(0177);
@@ -334,7 +362,7 @@
if (pfile == NULL) {
com_err(me, errno, _("Failed to open file %s: %s"), file_name,
strerror (errno));
-@@ -219,6 +219,9 @@ done:
+@@ -244,6 +244,9 @@ kdb5_ldap_stash_service_password(int arg
* Delete the existing entry and add the new entry
*/
FILE *newfile;
@@ -344,7 +372,7 @@
mode_t omask;
-@@ -230,7 +233,13 @@ done:
+@@ -255,7 +258,13 @@ kdb5_ldap_stash_service_password(int arg
}
omask = umask(077);
@@ -358,9 +386,11 @@
umask (omask);
if (newfile == NULL) {
com_err(me, errno, _("Error creating file %s"), tmp_file);
---- krb5-1.13.orig/src/util/profile/prof_file.c
-+++ krb5-1.13/src/util/profile/prof_file.c
-@@ -30,6 +30,7 @@
+Index: krb5-1.16.1/src/util/profile/prof_file.c
+===================================================================
+--- krb5-1.16.1.orig/src/util/profile/prof_file.c
++++ krb5-1.16.1/src/util/profile/prof_file.c
+@@ -33,6 +33,7 @@
#endif
#include "k5-platform.h"
@@ -368,7 +398,7 @@
struct global_shared_profile_data {
/* This is the head of the global list of shared trees */
-@@ -411,7 +412,7 @@ static errcode_t write_data_to_file(prf_
+@@ -423,7 +424,7 @@ static errcode_t write_data_to_file(prf_
errno = 0;
@@ -377,9 +407,11 @@
if (!f) {
retval = errno;
if (retval == 0)
---- krb5-1.13.orig/src/util/support/Makefile.in
-+++ krb5-1.13/src/util/support/Makefile.in
-@@ -59,6 +59,7 @@ IPC_SYMS= \
+Index: krb5-1.16.1/src/util/support/Makefile.in
+===================================================================
+--- krb5-1.16.1.orig/src/util/support/Makefile.in
++++ krb5-1.16.1/src/util/support/Makefile.in
+@@ -69,6 +69,7 @@ IPC_SYMS= \
STLIBOBJS= \
threads.o \
@@ -387,7 +419,7 @@
init-addrinfo.o \
plugins.o \
errors.o \
-@@ -131,7 +132,7 @@ SRCS=\
+@@ -149,7 +150,7 @@ SRCS=\
SHLIB_EXPDEPS =
# Add -lm if dumping thread stats, for sqrt.
@@ -396,8 +428,10 @@
DEPLIBS=
+Index: krb5-1.16.1/src/util/support/selinux.c
+===================================================================
--- /dev/null
-+++ krb5-1.13/src/util/support/selinux.c
++++ krb5-1.16.1/src/util/support/selinux.c
@@ -0,0 +1,381 @@
+/*
+ * Copyright 2007,2008,2009,2011,2012,2013 Red Hat, Inc. All Rights Reserved.
@@ -780,9 +814,11 @@
+}
+
+#endif
---- krb5-1.13.orig/src/lib/krb5/rcache/rc_dfl.c
-+++ krb5-1.13/src/lib/krb5/rcache/rc_dfl.c
-@@ -794,6 +794,9 @@ krb5_rc_dfl_expunge_locked(krb5_context
+Index: krb5-1.16.1/src/lib/krb5/rcache/rc_dfl.c
+===================================================================
+--- krb5-1.16.1.orig/src/lib/krb5/rcache/rc_dfl.c
++++ krb5-1.16.1/src/lib/krb5/rcache/rc_dfl.c
+@@ -793,6 +793,9 @@ krb5_rc_dfl_expunge_locked(krb5_context
krb5_error_code retval = 0;
krb5_rcache tmp;
krb5_deltat lifespan = t->lifespan; /* save original lifespan */
@@ -792,7 +828,7 @@
if (! t->recovering) {
name = t->name;
-@@ -815,7 +818,17 @@ krb5_rc_dfl_expunge_locked(krb5_context
+@@ -814,7 +817,17 @@ krb5_rc_dfl_expunge_locked(krb5_context
retval = krb5_rc_resolve(context, tmp, 0);
if (retval)
goto cleanup;
@@ -810,8 +846,10 @@
if (retval)
goto cleanup;
for (q = t->a; q; q = q->na) {
---- krb5-1.13.orig/src/lib/krb5/ccache/cc_dir.c
-+++ krb5-1.13/src/lib/krb5/ccache/cc_dir.c
+Index: krb5-1.16.1/src/lib/krb5/ccache/cc_dir.c
+===================================================================
+--- krb5-1.16.1.orig/src/lib/krb5/ccache/cc_dir.c
++++ krb5-1.16.1/src/lib/krb5/ccache/cc_dir.c
@@ -183,10 +183,19 @@ write_primary_file(const char *primary_p
char *newpath = NULL;
FILE *fp = NULL;
@@ -858,9 +896,11 @@
k5_setmsg(context, KRB5_FCC_NOFILE,
_("Credential cache directory %s does not exist"),
dirname);
---- krb5-1.13.orig/src/lib/krb5/os/trace.c
-+++ krb5-1.13/src/lib/krb5/os/trace.c
-@@ -397,7 +397,7 @@ krb5_set_trace_filename(krb5_context con
+Index: krb5-1.16.1/src/lib/krb5/os/trace.c
+===================================================================
+--- krb5-1.16.1.orig/src/lib/krb5/os/trace.c
++++ krb5-1.16.1/src/lib/krb5/os/trace.c
+@@ -398,7 +398,7 @@ krb5_set_trace_filename(krb5_context con
fd = malloc(sizeof(*fd));
if (fd == NULL)
return ENOMEM;
@@ -869,9 +909,11 @@
if (*fd == -1) {
free(fd);
return errno;
---- krb5-1.13.orig/src/plugins/kdb/db2/kdb_db2.c
-+++ krb5-1.13/src/plugins/kdb/db2/kdb_db2.c
-@@ -695,8 +695,8 @@ ctx_create_db(krb5_context context, krb5
+Index: krb5-1.16.1/src/plugins/kdb/db2/kdb_db2.c
+===================================================================
+--- krb5-1.16.1.orig/src/plugins/kdb/db2/kdb_db2.c
++++ krb5-1.16.1/src/plugins/kdb/db2/kdb_db2.c
+@@ -694,8 +694,8 @@ ctx_create_db(krb5_context context, krb5
if (retval)
return retval;
@@ -882,8 +924,10 @@
if (dbc->db_lf_file < 0) {
retval = errno;
goto cleanup;
---- krb5-1.13.orig/src/plugins/kdb/db2/libdb2/recno/rec_open.c
-+++ krb5-1.13/src/plugins/kdb/db2/libdb2/recno/rec_open.c
+Index: krb5-1.16.1/src/plugins/kdb/db2/libdb2/recno/rec_open.c
+===================================================================
+--- krb5-1.16.1.orig/src/plugins/kdb/db2/libdb2/recno/rec_open.c
++++ krb5-1.16.1/src/plugins/kdb/db2/libdb2/recno/rec_open.c
@@ -51,6 +51,7 @@ static char sccsid[] = "@(#)rec_open.c 8
#include <stdio.h>
#include <unistd.h>
@@ -902,9 +946,11 @@
return (NULL);
if (fname != NULL && fcntl(rfd, F_SETFD, 1) == -1) {
---- krb5-1.13.orig/src/kdc/main.c
-+++ krb5-1.13/src/kdc/main.c
-@@ -847,7 +847,7 @@ write_pid_file(const char *path)
+Index: krb5-1.16.1/src/kdc/main.c
+===================================================================
+--- krb5-1.16.1.orig/src/kdc/main.c
++++ krb5-1.16.1/src/kdc/main.c
+@@ -873,7 +873,7 @@ write_pid_file(const char *path)
FILE *file;
unsigned long pid;
@@ -913,9 +959,11 @@
if (file == NULL)
return errno;
pid = (unsigned long) getpid();
---- krb5-1.13.orig/src/lib/kdb/kdb_log.c
-+++ krb5-1.13/src/lib/kdb/kdb_log.c
-@@ -464,7 +464,7 @@ ulog_map(krb5_context context, const cha
+Index: krb5-1.16.1/src/lib/kdb/kdb_log.c
+===================================================================
+--- krb5-1.16.1.orig/src/lib/kdb/kdb_log.c
++++ krb5-1.16.1/src/lib/kdb/kdb_log.c
+@@ -484,7 +484,7 @@ ulog_map(krb5_context context, const cha
if (extend_file_to(ulogfd, filesize) < 0)
return errno;
} else {
@@ -924,9 +972,11 @@
if (ulogfd == -1)
return errno;
}
---- krb5-1.13.orig/src/slave/kpropd.c
-+++ krb5-1.13/src/slave/kpropd.c
-@@ -460,7 +460,9 @@ doit(int fd)
+Index: krb5-1.16.1/src/slave/kpropd.c
+===================================================================
+--- krb5-1.16.1.orig/src/slave/kpropd.c
++++ krb5-1.16.1/src/slave/kpropd.c
+@@ -488,7 +488,9 @@ doit(int fd)
krb5_enctype etype;
int database_fd;
char host[INET6_ADDRSTRLEN + 1];
@@ -937,7 +987,7 @@
signal_wrapper(SIGALRM, alarm_handler);
alarm(params.iprop_resync_timeout);
fromlen = sizeof(from);
-@@ -516,9 +518,15 @@ doit(int fd)
+@@ -543,9 +545,15 @@ doit(int fd)
free(name);
exit(1);
}
++++++ krb5-1.15.3.tar.gz -> krb5-1.16.1.tar.gz ++++++
/work/SRC/openSUSE:Factory/krb5/krb5-1.15.3.tar.gz /work/SRC/openSUSE:Factory/.krb5.new/krb5-1.16.1.tar.gz differ: char 5, line 1
1
0
Hello community,
here is the log from the commit of package you-get for openSUSE:Factory checked in at 2018-10-29 14:23:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/you-get (Old)
and /work/SRC/openSUSE:Factory/.you-get.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "you-get"
Mon Oct 29 14:23:10 2018 rev:13 rq:645201 version:0.4.1164
Changes:
--------
--- /work/SRC/openSUSE:Factory/you-get/you-get.changes 2018-10-15 09:40:35.751530529 +0200
+++ /work/SRC/openSUSE:Factory/.you-get.new/you-get.changes 2018-10-29 14:32:42.666687069 +0100
@@ -1,0 +2,5 @@
+Mon Oct 29 09:38:50 UTC 2018 - Luigi Baldoni <aloisio(a)gmx.com>
+
+- Update to version 0.4.1164 (no changelog supplied)
+
+-------------------------------------------------------------------
Old:
----
you-get-0.4.1148.tar.gz
New:
----
you-get-0.4.1164.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ you-get.spec ++++++
--- /var/tmp/diff_new_pack.3qBeKO/_old 2018-10-29 14:32:43.338670273 +0100
+++ /var/tmp/diff_new_pack.3qBeKO/_new 2018-10-29 14:32:43.338670273 +0100
@@ -17,12 +17,12 @@
Name: you-get
-Version: 0.4.1148
+Version: 0.4.1164
Release: 0
Summary: Dumb downloader that scrapes the web
License: MIT
Group: Productivity/Networking/Web/Utilities
-Url: https://you-get.org
+URL: https://you-get.org
Source0: https://github.com/soimort/you-get/archive/v%{version}.tar.gz#/%{name}-%{ve…
BuildRequires: bash-completion
BuildRequires: fdupes
++++++ you-get-0.4.1148.tar.gz -> you-get-0.4.1164.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/you-get-0.4.1148/.travis.yml new/you-get-0.4.1164/.travis.yml
--- old/you-get-0.4.1148/.travis.yml 2018-09-11 23:51:43.000000000 +0200
+++ new/you-get-0.4.1164/.travis.yml 2018-10-28 13:33:28.000000000 +0100
@@ -8,9 +8,10 @@
- "3.6"
- "nightly"
- "pypy3"
-before_install: pip install flake8
+before_install:
+ - if [[ $TRAVIS_PYTHON_VERSION != '3.2'* && $TRAVIS_PYTHON_VERSION != '3.3'* ]]; then pip install flake8; fi
before_script:
- - if [[ $TRAVIS_PYTHON_VERSION != '3.2'* ]]; then flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics; fi
+ - if [[ $TRAVIS_PYTHON_VERSION != '3.2'* && $TRAVIS_PYTHON_VERSION != '3.3'* ]]; then flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics; fi
script: make test
sudo: false
notifications:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/you-get-0.4.1148/README.md new/you-get-0.4.1164/README.md
--- old/you-get-0.4.1148/README.md 2018-09-11 23:51:43.000000000 +0200
+++ new/you-get-0.4.1164/README.md 2018-10-28 13:33:28.000000000 +0100
@@ -113,6 +113,14 @@
$ brew install you-get
```
+### Option 8: pkg (FreeBSD only)
+
+You can install `you-get` easily via:
+
+```
+# pkg install you-get
+```
+
### Shell completion
Completion definitions for Bash, Fish and Zsh can be found in [`contrib/completion`](https://github.com/soimort/you-get/tree/develop/contrib/completion). Please consult your shell's manual for how to take advantage of them.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/you-get-0.4.1148/src/you_get/common.py new/you-get-0.4.1164/src/you_get/common.py
--- old/you-get-0.4.1148/src/you_get/common.py 2018-09-11 23:51:43.000000000 +0200
+++ new/you-get-0.4.1164/src/you_get/common.py 2018-10-28 13:33:28.000000000 +0100
@@ -622,7 +622,7 @@
if not is_part:
if bar:
bar.done()
- print(
+ log.w(
'Skipping {}: file already exists'.format(
tr(os.path.basename(filepath))
)
@@ -648,7 +648,10 @@
print('Changing name to %s' % tr(os.path.basename(filepath)), '...')
continue_renameing = True
continue
- print('Overwriting %s' % tr(os.path.basename(filepath)), '...')
+ if log.yes_or_no('File with this name already exists. Overwrite?'):
+ log.w('Overwriting %s ...' % tr(os.path.basename(filepath)))
+ else:
+ return
elif not os.path.exists(os.path.dirname(filepath)):
os.mkdir(os.path.dirname(filepath))
@@ -925,7 +928,7 @@
if total_size:
if not force and os.path.exists(output_filepath) and not auto_rename\
and os.path.getsize(output_filepath) >= total_size * 0.9:
- print('Skipping %s: file already exists' % output_filepath)
+ log.w('Skipping %s: file already exists' % output_filepath)
print()
return
bar = SimpleProgressBar(total_size, len(urls))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/you-get-0.4.1148/src/you_get/extractors/bilibili.py new/you-get-0.4.1164/src/you_get/extractors/bilibili.py
--- old/you-get-0.4.1148/src/you_get/extractors/bilibili.py 2018-09-11 23:51:43.000000000 +0200
+++ new/you-get-0.4.1164/src/you_get/extractors/bilibili.py 2018-10-28 13:33:28.000000000 +0100
@@ -192,7 +192,12 @@
index_id = int(re.search(r'index_(\d+)', self.url).group(1))
cid = page_list[index_id-1]['cid'] # change cid match rule
except:
- cid = re.search(r'"cid":(\d+)', self.page).group(1)
+ page = re.search(r'p=(\d+)', self.url)
+ if page is None:
+ p = 1
+ else:
+ p = int(page.group(1))
+ cid = re.search(r'"cid":(\d+),"page":%s' % p, self.page).group(1)
if cid is not None:
self.download_by_vid(cid, re.search('bangumi', self.url) is not None, **kwargs)
else:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/you-get-0.4.1148/src/you_get/extractors/naver.py new/you-get-0.4.1164/src/you_get/extractors/naver.py
--- old/you-get-0.4.1148/src/you_get/extractors/naver.py 2018-09-11 23:51:43.000000000 +0200
+++ new/you-get-0.4.1164/src/you_get/extractors/naver.py 2018-10-28 13:33:28.000000000 +0100
@@ -7,31 +7,35 @@
from ..util import log
from ..common import get_content, download_urls, print_info, playlist_not_supported, url_size
+from .universal import *
__all__ = ['naver_download_by_url']
-def naver_download_by_url(url, info_only=False, **kwargs):
+def naver_download_by_url(url, output_dir='.', merge=True, info_only=False, **kwargs):
ep = 'https://apis.naver.com/rmcnmv/rmcnmv/vod/play/v2.0/{}?key={}'
page = get_content(url)
- og_video_url = re.search(r"<meta\s+property=\"og:video:url\"\s+content='(.+?)'>", page).group(1)
- params_dict = urllib.parse.parse_qs(urllib.parse.urlparse(og_video_url).query)
- vid = params_dict['vid'][0]
- key = params_dict['outKey'][0]
- meta_str = get_content(ep.format(vid, key))
- meta_json = json.loads(meta_str)
- if 'errorCode' in meta_json:
- log.wtf(meta_json['errorCode'])
- title = meta_json['meta']['subject']
- videos = meta_json['videos']['list']
- video_list = sorted(videos, key=lambda video: video['encodingOption']['width'])
- video_url = video_list[-1]['source']
- # size = video_list[-1]['size']
- # result wrong size
- size = url_size(video_url)
- print_info(site_info, title, 'mp4', size)
- if not info_only:
- download_urls([video_url], title, 'mp4', size, **kwargs)
+ try:
+ og_video_url = re.search(r"<meta\s+property=\"og:video:url\"\s+content='(.+?)'>", page).group(1)
+ params_dict = urllib.parse.parse_qs(urllib.parse.urlparse(og_video_url).query)
+ vid = params_dict['vid'][0]
+ key = params_dict['outKey'][0]
+ meta_str = get_content(ep.format(vid, key))
+ meta_json = json.loads(meta_str)
+ if 'errorCode' in meta_json:
+ log.wtf(meta_json['errorCode'])
+ title = meta_json['meta']['subject']
+ videos = meta_json['videos']['list']
+ video_list = sorted(videos, key=lambda video: video['encodingOption']['width'])
+ video_url = video_list[-1]['source']
+ # size = video_list[-1]['size']
+ # result wrong size
+ size = url_size(video_url)
+ print_info(site_info, title, 'mp4', size)
+ if not info_only:
+ download_urls([video_url], title, 'mp4', size, **kwargs)
+ except:
+ universal_download(url, output_dir, merge=merge, info_only=info_only, **kwargs)
site_info = "naver.com"
download = naver_download_by_url
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/you-get-0.4.1148/src/you_get/extractors/pptv.py new/you-get-0.4.1164/src/you_get/extractors/pptv.py
--- old/you-get-0.4.1148/src/you_get/extractors/pptv.py 2018-09-11 23:51:43.000000000 +0200
+++ new/you-get-0.4.1164/src/you_get/extractors/pptv.py 2018-10-28 13:33:28.000000000 +0100
@@ -192,14 +192,14 @@
if self.url and not self.vid:
if not re.match(r'http://v.pptv.com/show/(\w+)\.html', self.url):
raise('Unknown url pattern')
- page_content = get_content(self.url)
+ page_content = get_content(self.url,{"User-Agent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36"})
self.vid = match1(page_content, r'webcfg\s*=\s*{"id":\s*(\d+)')
if not self.vid:
raise('Cannot find id')
api_url = 'http://web-play.pptv.com/webplay3-0-{}.xml'.format(self.vid)
api_url += '?appplt=flp&appid=pptv.flashplayer.vod&appver=3.4.2.28&type=&version=4'
- dom = parseString(get_content(api_url))
+ dom = parseString(get_content(api_url,{"User-Agent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36"}))
self.title, m_items, m_streams, m_segs = parse_pptv_xml(dom)
xml_streams = merge_meta(m_items, m_streams, m_segs)
for stream_id in xml_streams:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/you-get-0.4.1148/src/you_get/extractors/sohu.py new/you-get-0.4.1164/src/you_get/extractors/sohu.py
--- old/you-get-0.4.1148/src/you_get/extractors/sohu.py 2018-09-11 23:51:43.000000000 +0200
+++ new/you-get-0.4.1164/src/you_get/extractors/sohu.py 2018-10-28 13:33:28.000000000 +0100
@@ -15,9 +15,9 @@
new api
'''
-def real_url(host,vid,tvid,new,clipURL,ck):
- url = 'http://'+host+'/?prot=9&prod=flash&pt=1&file='+clipURL+'&new='+new +'&key='+ ck+'&vid='+str(vid)+'&uid='+str(int(time.time()*1000))+'&t='+str(random())+'&rb=1'
- return json.loads(get_html(url))['url']
+def real_url(fileName, key, ch):
+ url = "https://data.vod.itc.cn/ip?new=" + fileName + "&num=1&key=" + key + "&ch=" + ch + "&pt=1&pg=2&prod=h5n"
+ return json.loads(get_html(url))['servers'][0]['url']
def sohu_download(url, output_dir = '.', merge = True, info_only = False, extractor_proxy=None, **kwargs):
if re.match(r'http://share.vrs.sohu.com', url):
@@ -51,9 +51,8 @@
title = data['tvName']
size = sum(data['clipsBytes'])
assert len(data['clipsURL']) == len(data['clipsBytes']) == len(data['su'])
- for new,clip,ck, in zip(data['su'], data['clipsURL'], data['ck']):
- clipURL = urlparse(clip).path
- urls.append(real_url(host,hqvid,tvid,new,clipURL,ck))
+ for fileName, key in zip(data['su'], data['ck']):
+ urls.append(real_url(fileName, key, data['ch']))
# assert data['clipsURL'][0].endswith('.mp4')
else:
@@ -66,9 +65,8 @@
title = data['tvName']
size = sum(map(int,data['clipsBytes']))
assert len(data['clipsURL']) == len(data['clipsBytes']) == len(data['su'])
- for new,clip,ck, in zip(data['su'], data['clipsURL'], data['ck']):
- clipURL = urlparse(clip).path
- urls.append(real_url(host,vid,tvid,new,clipURL,ck))
+ for fileName, key in zip(data['su'], data['ck']):
+ urls.append(real_url(fileName, key, data['ch']))
print_info(site_info, title, 'mp4', size)
if not info_only:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/you-get-0.4.1148/src/you_get/extractors/tumblr.py new/you-get-0.4.1164/src/you_get/extractors/tumblr.py
--- old/you-get-0.4.1148/src/you_get/extractors/tumblr.py 2018-09-11 23:51:43.000000000 +0200
+++ new/you-get-0.4.1164/src/you_get/extractors/tumblr.py 2018-10-28 13:33:28.000000000 +0100
@@ -33,7 +33,7 @@
'X-Requested-With': 'XMLHttpRequest'
},
post_data_raw='{"eu_resident":true,"gdpr_is_acceptable_age":true,"gdpr_consent_core":true,"gdpr_consent_first_party_ads":true,"gdpr_consent_third_party_ads":true,"gdpr_consent_search_history":true,"redirect_to":"%s","gdpr_reconsent":false}' % url)
- page = get_html(url)
+ page = get_html(url, faker=True)
html = parse.unquote(page).replace('\/', '/')
feed = r1(r'<meta property="og:type" content="tumblr-feed:(\w+)" />', html)
@@ -43,9 +43,9 @@
page_title = r1(r'<meta name="description" content="([^"\n]+)', html) or \
r1(r'<meta property="og:description" content="([^"\n]+)', html) or \
r1(r'<title>([^<\n]*)', html)
- urls = re.findall(r'(https?://[^;"&]+/tumblr_[^;"]+_\d+\.jpg)', html) +\
- re.findall(r'(https?://[^;"&]+/tumblr_[^;"]+_\d+\.png)', html) +\
- re.findall(r'(https?://[^;"&]+/tumblr_[^";]+_\d+\.gif)', html)
+ urls = re.findall(r'(https?://[^;"&]+/tumblr_[^;"&]+_\d+\.jpg)', html) +\
+ re.findall(r'(https?://[^;"&]+/tumblr_[^;"&]+_\d+\.png)', html) +\
+ re.findall(r'(https?://[^;"&]+/tumblr_[^";&]+_\d+\.gif)', html)
tuggles = {}
for url in urls:
@@ -121,11 +121,15 @@
r1(r'<meta property="og:description" content="([^"]*)" />', html) or
r1(r'<title>([^<\n]*)', html) or url.split("/")[4]).replace('\n', '')
- type, ext, size = url_info(real_url)
+ # this is better
+ vcode = r1(r'tumblr_(\w+)', real_url)
+ real_url = 'https://vt.media.tumblr.com/tumblr_%s.mp4' % vcode
+
+ type, ext, size = url_info(real_url, faker=True)
print_info(site_info, title, type, size)
if not info_only:
- download_urls([real_url], title, ext, size, output_dir, merge = merge)
+ download_urls([real_url], title, ext, size, output_dir, merge=merge)
site_info = "Tumblr.com"
download = tumblr_download
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/you-get-0.4.1148/src/you_get/extractors/universal.py new/you-get-0.4.1164/src/you_get/extractors/universal.py
--- old/you-get-0.4.1148/src/you_get/extractors/universal.py 2018-09-11 23:51:43.000000000 +0200
+++ new/you-get-0.4.1164/src/you_get/extractors/universal.py 2018-10-28 13:33:28.000000000 +0100
@@ -67,9 +67,9 @@
urls = []
for i in media_exts:
- urls += re.findall(r'(https?://[^ ;"\'\\]+' + i + r'[^ ;"\'\\]*)', page)
+ urls += re.findall(r'(https?://[^ ;&"\'\\]+' + i + r'[^ ;&"\'\\]*)', page)
- p_urls = re.findall(r'(https?%3A%2F%2F[^;&]+' + i + r'[^;&]*)', page)
+ p_urls = re.findall(r'(https?%3A%2F%2F[^;&"]+' + i + r'[^;&"]*)', page)
urls += [parse.unquote(url) for url in p_urls]
q_urls = re.findall(r'(https?:\\\\/\\\\/[^ ;"\']+' + i + r'[^ ;"\']*)', page)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/you-get-0.4.1148/src/you_get/extractors/yixia.py new/you-get-0.4.1164/src/you_get/extractors/yixia.py
--- old/you-get-0.4.1148/src/you_get/extractors/yixia.py 2018-09-11 23:51:43.000000000 +0200
+++ new/you-get-0.4.1164/src/you_get/extractors/yixia.py 2018-10-28 13:33:28.000000000 +0100
@@ -8,6 +8,24 @@
import re
#----------------------------------------------------------------------
+def miaopai_download_by_smid(smid, output_dir = '.', merge = True, info_only = False):
+ """"""
+ api_endpoint = 'https://n.miaopai.com/api/aj_media/info.json?smid={smid}'.format(smid = smid)
+
+ html = get_content(api_endpoint)
+
+ api_content = loads(html)
+
+ video_url = api_content['data']['meta_data'][0]['play_urls']['l']
+ title = api_content['data']['description']
+
+ type, ext, size = url_info(video_url)
+
+ print_info(site_info, title, type, size)
+ if not info_only:
+ download_urls([video_url], title, ext, size, output_dir, merge=merge)
+
+#----------------------------------------------------------------------
def yixia_miaopai_download_by_scid(scid, output_dir = '.', merge = True, info_only = False):
""""""
api_endpoint = 'http://api.miaopai.com/m/v2_channel.json?fillType=259&scid={scid}&vend=miao…'.format(scid = scid)
@@ -47,7 +65,11 @@
def yixia_download(url, output_dir = '.', merge = True, info_only = False, **kwargs):
"""wrapper"""
hostname = urlparse(url).hostname
- if 'miaopai.com' in hostname: #Miaopai
+ if 'n.miaopai.com' == hostname:
+ smid = match1(url, r'n\.miaopai\.com/media/([^.]+)')
+ miaopai_download_by_smid(smid, output_dir, merge, info_only)
+ return
+ elif 'miaopai.com' in hostname: #Miaopai
yixia_download_by_scid = yixia_miaopai_download_by_scid
site_info = "Yixia Miaopai"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/you-get-0.4.1148/src/you_get/util/fs.py new/you-get-0.4.1164/src/you_get/util/fs.py
--- old/you-get-0.4.1148/src/you_get/util/fs.py 2018-09-11 23:51:43.000000000 +0200
+++ new/you-get-0.4.1164/src/you_get/util/fs.py 2018-10-28 13:33:28.000000000 +0100
@@ -13,6 +13,7 @@
ord('|'): '-',
})
+ # FIXME: do some filesystem detection
if os == 'windows' or os == 'cygwin' or os == 'wsl':
# Windows (non-POSIX namespace)
text = text.translate({
@@ -28,6 +29,7 @@
ord('>'): '-',
ord('['): '(',
ord(']'): ')',
+ ord('\t'): ' ',
})
else:
# *nix
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/you-get-0.4.1148/src/you_get/util/log.py new/you-get-0.4.1164/src/you_get/util/log.py
--- old/you-get-0.4.1148/src/you_get/util/log.py 2018-09-11 23:51:43.000000000 +0200
+++ new/you-get-0.4.1164/src/you_get/util/log.py 2018-10-28 13:33:28.000000000 +0100
@@ -96,3 +96,9 @@
print_log(message, RED, BOLD)
if exit_code is not None:
sys.exit(exit_code)
+
+def yes_or_no(message):
+ ans = str(input('%s (y/N) ' % message)).lower().strip()
+ if ans == 'y':
+ return True
+ return False
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/you-get-0.4.1148/src/you_get/version.py new/you-get-0.4.1164/src/you_get/version.py
--- old/you-get-0.4.1148/src/you_get/version.py 2018-09-11 23:51:43.000000000 +0200
+++ new/you-get-0.4.1164/src/you_get/version.py 2018-10-28 13:33:28.000000000 +0100
@@ -1,4 +1,4 @@
#!/usr/bin/env python
script_name = 'you-get'
-__version__ = '0.4.1148'
+__version__ = '0.4.1164'
1
0
Hello community,
here is the log from the commit of package xnoise for openSUSE:Factory checked in at 2018-10-29 14:21:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xnoise (Old)
and /work/SRC/openSUSE:Factory/.xnoise.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xnoise"
Mon Oct 29 14:21:36 2018 rev:7 rq:644813 version:0.2.21
Changes:
--------
--- /work/SRC/openSUSE:Factory/xnoise/xnoise.changes 2018-05-11 09:18:22.966281240 +0200
+++ /work/SRC/openSUSE:Factory/.xnoise.new/xnoise.changes 2018-10-29 14:32:19.187292100 +0100
@@ -1,0 +2,6 @@
+Thu Oct 25 12:16:46 UTC 2018 - sor.alexei(a)meowr.ru
+
+- Update xnoise-compilation-fix.patch for the removal of
+ Gtk.STOCK_DIRECTORY.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xnoise.spec ++++++
--- /var/tmp/diff_new_pack.Azizwk/_old 2018-10-29 14:32:20.463258288 +0100
+++ /var/tmp/diff_new_pack.Azizwk/_new 2018-10-29 14:32:20.491257547 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -132,11 +132,7 @@
%endif
%files
-%if 0%{?suse_version} >= 1500
%license COPYING
-%else
-%doc COPYING
-%endif
%doc AUTHORS ChangeLog MAINTAINERS NEWS README
%{_bindir}/%{name}
%{_bindir}/%{name}_image_extractor_service
++++++ xnoise-compilation-fix.patch ++++++
--- /var/tmp/diff_new_pack.Azizwk/_old 2018-10-29 14:32:20.903246647 +0100
+++ /var/tmp/diff_new_pack.Azizwk/_new 2018-10-29 14:32:20.923246118 +0100
@@ -9,6 +9,19 @@
}
public enum Priority {
+--- a/libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.vala
++++ b/libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.vala
+@@ -199,8 +199,8 @@ private class Xnoise.AddMediaWidget : Gt
+ }
+
+ private void update_item_list() {
+- Gtk.Invisible w = new Gtk.Invisible();
+- Gdk.Pixbuf folder_icon = w.render_icon_pixbuf(Gtk.STOCK_DIRECTORY, IconSize.MENU);
++ Gtk.IconTheme icon_theme = Gtk.IconTheme.get_default();
++ Gdk.Pixbuf folder_icon = icon_theme.load_icon("folder", 16, 0);
+ listmodel.clear();
+ GLib.List<Item?> list = media_importer.get_media_folder_list();
+ foreach(Item? i in list) {
--- a/libxnoise/ExtraWidgets/xnoise-tree-media-selector.vala
+++ b/libxnoise/ExtraWidgets/xnoise-tree-media-selector.vala
@@ -404,7 +404,11 @@ private class Xnoise.TreeMediaSelector :
1
0
Hello community,
here is the log from the commit of package wine for openSUSE:Factory checked in at 2018-10-29 14:22:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wine (Old)
and /work/SRC/openSUSE:Factory/.wine.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wine"
Mon Oct 29 14:22:56 2018 rev:265 rq:645124 version:3.19
Changes:
--------
--- /work/SRC/openSUSE:Factory/wine/wine.changes 2018-10-15 09:47:30.623098757 +0200
+++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2018-10-29 14:30:52.053899607 +0100
@@ -1,0 +2,12 @@
+Sat Oct 27 07:57:19 UTC 2018 - meissner(a)suse.com
+
+- Update to 3.19 development release
+ - Support for file I/O completion modes.
+ - WaitOnAddress synchronization primitives.
+ - Better support for 32-bit .NET binaries on 64-bit.
+ - Improved recovery on broken RPC connection.
+ - Various bug fixes.
+- updated staging to 3.19
+- updated winetricks
+
+-------------------------------------------------------------------
Old:
----
wine-3.18.tar.xz
wine-3.18.tar.xz.sign
wine-staging-3.18.tar.xz
New:
----
wine-3.19.tar.xz
wine-3.19.tar.xz.sign
wine-staging-3.19.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wine.spec ++++++
--- /var/tmp/diff_new_pack.keYIdv/_old 2018-10-29 14:30:57.517714134 +0100
+++ /var/tmp/diff_new_pack.keYIdv/_new 2018-10-29 14:30:57.521714002 +0100
@@ -107,8 +107,8 @@
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(xxf86vm)
BuildRequires: pkgconfig(zlib)
-%define realver 3.18
-Version: 3.18
+%define realver 3.19
+Version: 3.19
Release: 0
Summary: An MS Windows Emulator
License: LGPL-2.1-or-later
@@ -146,7 +146,7 @@
ExclusiveArch: %{ix86} x86_64 ppc %arm aarch64
%if %{staging}
# upstream patch target version
-%define staging_version 3.18
+%define staging_version 3.19
Source100: wine-staging-%{staging_version}.tar.xz
BuildRequires: gtk3-devel
BuildRequires: libOSMesa-devel
++++++ _service ++++++
--- /var/tmp/diff_new_pack.keYIdv/_old 2018-10-29 14:30:57.561712677 +0100
+++ /var/tmp/diff_new_pack.keYIdv/_new 2018-10-29 14:30:57.565712544 +0100
@@ -3,7 +3,7 @@
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="url">https://github.com/wine-staging/wine-staging.git</param>
- <param name="revision">refs/tags/v3.18</param>
+ <param name="revision">refs/tags/v3.19</param>
<param name="match-tag">v*.*</param>
<param name="scm">git</param>
</service>
++++++ wine-3.18.tar.xz -> wine-3.19.tar.xz ++++++
/work/SRC/openSUSE:Factory/wine/wine-3.18.tar.xz /work/SRC/openSUSE:Factory/.wine.new/wine-3.19.tar.xz differ: char 26, line 1
++++++ wine-staging-3.18.tar.xz -> wine-staging-3.19.tar.xz ++++++
/work/SRC/openSUSE:Factory/wine/wine-staging-3.18.tar.xz /work/SRC/openSUSE:Factory/.wine.new/wine-staging-3.19.tar.xz differ: char 26, line 1
++++++ winetricks ++++++
--- /var/tmp/diff_new_pack.keYIdv/_old 2018-10-29 14:30:57.649709763 +0100
+++ /var/tmp/diff_new_pack.keYIdv/_new 2018-10-29 14:30:57.653709631 +0100
@@ -5381,6 +5381,10 @@
return 0
}
+# Test whether temporary directory is valid - before initialising script
+[ -d "$W_TMP_EARLY" ] || w_die "temporary directory: '$W_TMP_EARLY' ; does not exist"
+[ -w "$W_TMP_EARLY" ] || w_die "temporary directory: '$W_TMP_EARLY' ; is not user writeable"
+
# Must initialize variables before calling w_metadata
if ! test "$WINETRICKS_LIB"
then
@@ -6887,6 +6891,44 @@
helper_dxvk "$file1" "d3d10_enabled" "3.10" "1.0.76"
}
+w_metadata dxvk81 dlls \
+ title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.81)" \
+ publisher="Philip Rebohle" \
+ year="2018" \
+ media="download" \
+ file1="dxvk-0.81.tar.gz" \
+ installed_file1="$W_SYSTEM32_DLLS_WIN/d3d10.dll" \
+ installed_file2="$W_SYSTEM32_DLLS_WIN/d3d10_1.dll" \
+ installed_file3="$W_SYSTEM32_DLLS_WIN/d3d10core.dll" \
+ installed_file4="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
+ installed_file5="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
+
+load_dxvk81()
+{
+ # https://github.com/doitsujin/dxvk
+ w_download "https://github.com/doitsujin/dxvk/releases/download/v0.81/dxvk-0.81.tar.gz" 9bf6eda9ae4ee74b509e07dfe9cc003dfa4bba192b519dacdd542a57f6a43869
+ helper_dxvk "$file1" "d3d10_enabled" "3.10" "1.0.76"
+}
+
+w_metadata dxvk90 dlls \
+ title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.90)" \
+ publisher="Philip Rebohle" \
+ year="2018" \
+ media="download" \
+ file1="dxvk-0.90.tar.gz" \
+ installed_file1="$W_SYSTEM32_DLLS_WIN/d3d10.dll" \
+ installed_file2="$W_SYSTEM32_DLLS_WIN/d3d10_1.dll" \
+ installed_file3="$W_SYSTEM32_DLLS_WIN/d3d10core.dll" \
+ installed_file4="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
+ installed_file5="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
+
+load_dxvk90()
+{
+ # https://github.com/doitsujin/dxvk
+ w_download "https://github.com/doitsujin/dxvk/releases/download/v0.90/dxvk-0.90.tar.gz" 15bce7b282065054ff9233b33738bf1d2c74b16829361cbd6843bc2f5dfe4509
+ helper_dxvk "$file1" "d3d10_enabled" "3.19" "1.1.88"
+}
+
#----------------------------------------------------------------
@@ -6908,7 +6950,7 @@
w_download_to "${W_TMP_EARLY}" "https://raw.githubusercontent.com/doitsujin/dxvk/master/RELEASE"
dxvk_version="$(cat "${W_TMP_EARLY}/RELEASE")"
w_linkcheck=1_ignore w_download "https://github.com/doitsujin/dxvk/releases/download/v${dxvk_version}/dxvk-$…"
- helper_dxvk "dxvk-${dxvk_version}.tar.gz" "d3d10_enabled" "3.10" "1.0.76"
+ helper_dxvk "dxvk-${dxvk_version}.tar.gz" "d3d10_enabled" "3.19" "1.1.88"
unset dxvk_version
}
1
0
Hello community,
here is the log from the commit of package vertex-gtk-theme for openSUSE:Factory checked in at 2018-10-29 14:21:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vertex-gtk-theme (Old)
and /work/SRC/openSUSE:Factory/.vertex-gtk-theme.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vertex-gtk-theme"
Mon Oct 29 14:21:26 2018 rev:8 rq:644751 version:20170128
Changes:
--------
--- /work/SRC/openSUSE:Factory/vertex-gtk-theme/vertex-gtk-theme.changes 2017-05-10 20:53:35.172865839 +0200
+++ /work/SRC/openSUSE:Factory/.vertex-gtk-theme.new/vertex-gtk-theme.changes 2018-10-29 14:29:43.876694891 +0100
@@ -1,0 +2,6 @@
+Thu Oct 25 12:16:46 UTC 2018 - sor.alexei(a)meowr.ru
+
+- Support GTK+ 3.24.
+- Disable GNOME Shell support for openSUSE Leap 15.1 and newer.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vertex-gtk-theme.spec ++++++
--- /var/tmp/diff_new_pack.xaNk8S/_old 2018-10-29 14:29:44.484667233 +0100
+++ /var/tmp/diff_new_pack.xaNk8S/_new 2018-10-29 14:29:44.484667233 +0100
@@ -1,7 +1,7 @@
#
# spec file for package vertex-gtk-theme
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -22,9 +22,9 @@
Version: 20170128
Release: 0
Summary: Vertex GTK+ theme
-License: GPL-3.0+
+License: GPL-3.0-or-later
Group: System/GUI/Other
-Url: https://github.com/horst3180/Vertex-theme
+URL: https://github.com/horst3180/Vertex-theme
Source: https://github.com/horst3180/%{_name}-theme/archive/%{version}.tar.gz#/%{_n…
BuildRequires: autoconf
BuildRequires: automake
@@ -36,7 +36,7 @@
%description
Vertex is a modern theme that comes with three variants to choose
from. The default variant with dark header-bars, a light variant,
-and a dark variant. It supports MATE, GNOME, Xfce, and Cinnamon.
+and a dark variant. It supports MATE, Xfce, and Cinnamon.
%package -n metatheme-%{_name}-common
Summary: Vertex Common Theme Files
@@ -48,10 +48,10 @@
%description -n metatheme-%{_name}-common
Vertex is a modern theme that comes with three variants to choose
from. The default variant with dark header-bars, a light variant,
-and a dark variant. It supports MATE, GNOME, Xfce, and Cinnamon.
+and a dark variant. It supports MATE, Xfce, and Cinnamon.
-This package contains common files and themes for GNOME Shell,
-Marco, Xfwm4, and Cinnamon.
+This package contains common files and themes for Marco, Xfwm4, and
+Cinnamon.
%package -n gtk2-metatheme-%{_name}
Summary: Vertex GTK+2 Theme
@@ -63,7 +63,7 @@
%description -n gtk2-metatheme-%{_name}
Vertex is a modern theme that comes with three variants to choose
from. The default variant with dark header-bars, a light variant,
-and a dark variant. It supports MATE, GNOME, Xfce, and Cinnamon.
+and a dark variant. It supports MATE, Xfce, and Cinnamon.
This package contains the GTK+2 theme.
@@ -77,7 +77,7 @@
%description -n gtk3-metatheme-%{_name}
Vertex is a modern theme that comes with three variants to choose
from. The default variant with dark header-bars, a light variant,
-and a dark variant. It supports MATE, GNOME, Xfce, and Cinnamon.
+and a dark variant. It supports MATE, Xfce, and Cinnamon.
This package contains the GTK+3 theme.
@@ -86,9 +86,17 @@
sed -i '/configure/d' autogen.sh
sed -i 's/^\(IconTheme=\).*$/\1Adwaita/' common/index.theme*
+[ ! -f common/gtk-3.0/3.24 ]
+ln -s 3.20 common/gtk-3.0/3.24
+
%build
./autogen.sh
-%configure
+%configure \
+%if 0%{?suse_version} > 1500
+ --disable-gnome-shell
+%else
+ --enable-gnome-shell
+%endif
make %{?_smp_mflags} V=1
%install
@@ -97,21 +105,21 @@
%fdupes %{buildroot}%{_datadir}/
%files -n metatheme-%{_name}-common
-%defattr(-,root,root)
-%doc AUTHORS COPYING
+%license COPYING
+%doc AUTHORS
%dir %{_datadir}/themes/%{_theme}*/
%exclude %{_datadir}/themes/%{_theme}*/gtk-2.*/
%exclude %{_datadir}/themes/%{_theme}*/gtk-3.*/
%{_datadir}/themes/%{_theme}*/*
%files -n gtk2-metatheme-%{_name}
-%defattr(-,root,root)
-%doc AUTHORS COPYING
+%license COPYING
+%doc AUTHORS
%{_datadir}/themes/%{_theme}*/gtk-2.*/
%files -n gtk3-metatheme-%{_name}
-%defattr(-,root,root)
-%doc AUTHORS COPYING
+%license COPYING
+%doc AUTHORS
%{_datadir}/themes/%{_theme}*/gtk-3.*/
%changelog
1
0
Hello community,
here is the log from the commit of package trousers for openSUSE:Factory checked in at 2018-10-29 14:21:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/trousers (Old)
and /work/SRC/openSUSE:Factory/.trousers.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trousers"
Mon Oct 29 14:21:50 2018 rev:39 rq:644837 version:0.3.14
Changes:
--------
--- /work/SRC/openSUSE:Factory/trousers/trousers.changes 2018-10-25 09:12:49.850272258 +0200
+++ /work/SRC/openSUSE:Factory/.trousers.new/trousers.changes 2018-10-29 14:29:09.886331322 +0100
@@ -1,0 +2,9 @@
+Fri Oct 26 11:13:37 UTC 2018 - matthias.gerstner(a)suse.com
+
+- fix mode of /var/lib/tpm, was missing the execute bit in the previous
+ version.
+- implement a backup and restore logic for /var/lib/tpm/system.data.* to
+ prevent removal of validly stored trousers state during update. See previous
+ comment for the packaging error that leads to this requirement.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ trousers.spec ++++++
--- /var/tmp/diff_new_pack.bvBoGv/_old 2018-10-29 14:29:10.554297403 +0100
+++ /var/tmp/diff_new_pack.bvBoGv/_new 2018-10-29 14:29:10.558297200 +0100
@@ -16,6 +16,7 @@
#
+%define tpmstatedir %{_localstatedir}/lib/tpm
Name: trousers
Version: 0.3.14
Release: 0
@@ -31,6 +32,8 @@
BuildRequires: openssl-devel
BuildRequires: pkg-config
BuildRequires: systemd-rpm-macros
+# for 'stat' for the hack in %pretrans
+BuildRequires: coreutils
Requires(pre): pwdutils
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -89,7 +92,7 @@
%install
%define trousers_data %{buildroot}%{_datadir}/%{name}
-%define trousers_state %{buildroot}%{_localstatedir}/lib/tpm
+%define trousers_state %{buildroot}%{tpmstatedir}
make DESTDIR=%{buildroot} install %{?_smp_mflags}
mkdir -p %{trousers_state}
install -D -m 0644 %{SOURCE1} %{buildroot}/%{_unitdir}/tcsd.service
@@ -108,12 +111,49 @@
%_bindir/getent group tss >/dev/null || %{_sbindir}/groupadd -g 98 tss || :
%_bindir/getent passwd tss >/dev/null || \
%{_sbindir}/useradd -u 98 -o -g tss -s /bin/false -c "TSS daemon" \
- -d %{_localstatedir}/lib/tpm tss || :
+ -d %{tpmstatedir} tss || :
%service_add_pre tcsd.service
+%pretrans
+# this scriplet and the counterpart in %posttrans work around a packaging bug
+# that was present in all trousers packages since around 2008.
+# /var/lib/tpm/system.data.* was wrongly packaged as runtime state data
+# instead of package resource data in /usr/share. After removal of these files
+# from packaging, after updating they will be deleted. Since users could have
+# created their own versions of the files already (by taking ownership of a
+# TPM) we want to keep those files in place.
+#
+# to achieve this we use the ownership of /var/lib/tpm as an indicator.
+# Versions that still wrongly package those files also had the ownership of
+# the directory wrong. Therefore if the directory is not owned by the tss user
+# we apply a backup and restore logic.
+[ ! -d "%{tpmstatedir}" ] && exit 0
+OWNER=`/usr/bin/stat -c "%U" "%{tpmstatedir}"`
+[ "$OWNER" = "tss" ] && exit 0
+for data in system.data.auth system.data.noauth; do
+ file="%{tpmstatedir}/${data}"
+ [ ! -e "$file" ] && continue
+ cp -p $file ${file}.rpmsave
+ echo "saving backup of $file"
+done
+
%post
%service_add_post tcsd.service
+%posttrans
+# see pretrans for an explanation of this
+for data in system.data.auth system.data.noauth; do
+ file="%{tpmstatedir}/${data}"
+ # nothing to restore here
+ [ ! -e "${file}.rpmsave" ] && continue
+ # for some reason the to-be-restored file already exists? ignore.
+ [ -e "${file}" ] && continue
+ # restore the original file
+ echo "restoring backup of $file"
+ mv ${file}.rpmsave ${file}
+ chown tss:tss "${file}"
+done
+
%postun
%service_del_postun tcsd.service
@@ -130,7 +170,7 @@
%doc README README.selinux AUTHORS ChangeLog LICENSE NICETOHAVES TODO doc/*
%{_mandir}/man5/*
%{_mandir}/man8/*
-%attr(640,tss,tss) %{_localstatedir}/lib/tpm
+%attr(750,tss,tss) %{tpmstatedir}
%{_datadir}/%{name}
%{_sbindir}/tcsd
%{_sbindir}/rctcsd
1
0
Hello community,
here is the log from the commit of package timezone for openSUSE:Factory checked in at 2018-10-29 14:14:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/timezone (Old)
and /work/SRC/openSUSE:Factory/.timezone.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "timezone"
Mon Oct 29 14:14:08 2018 rev:122 rq:645023 version:2018g
Changes:
--------
--- /work/SRC/openSUSE:Factory/timezone/timezone-java.changes 2018-05-25 21:34:04.495003540 +0200
+++ /work/SRC/openSUSE:Factory/.timezone.new/timezone-java.changes 2018-10-29 14:28:55.799064514 +0100
@@ -1,0 +2,27 @@
+Sat Oct 27 12:20:44 UTC 2018 - astieger(a)suse.com
+
+- timezone update 2018g:
+ * Morocco switches to permanent +01 on 2018-10-27 (bsc#1113554)
+ * code fixes for zic on 32 bit
+
+-------------------------------------------------------------------
+Thu Oct 18 13:28:04 UTC 2018 - astieger(a)suse.com
+
+- Avoid build failures of timezone-java with javazic SLE/Leap 15
+ by using an alternative notation for a 1948-1951 DST transition
+ in Japan. add timezone-2018f-bsc1112310.patch, fixes boo#1112310
+
+-------------------------------------------------------------------
+Thu Oct 18 07:56:09 UTC 2018 - astieger(a)suse.com
+
+- timezone update 2018f:
+ * Volgograd moves from +03 to +04 on 2018-10-28.
+ * Fiji ends DST 2019-01-13, not 2019-01-20.
+ * Most of Chile changes DST dates, effective 2019-04-06
+ (bsc#1104700)
+ * Corrections to past timestamps of DST transitions
+ * Use "PST" and "PDT" for Philippine time
+ * minor code changes to zic handling of the TZif format
+ * documentation updates
+
+-------------------------------------------------------------------
timezone.changes: same change
Old:
----
tzcode2018e.tar.gz
tzcode2018e.tar.gz.asc
tzdata2018e.tar.gz
tzdata2018e.tar.gz.asc
New:
----
timezone-2018f-bsc1112310.patch
tzcode2018g.tar.gz
tzcode2018g.tar.gz.asc
tzdata2018g.tar.gz
tzdata2018g.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ timezone-java.spec ++++++
--- /var/tmp/diff_new_pack.ZpPeqF/_old 2018-10-29 14:28:56.615021119 +0100
+++ /var/tmp/diff_new_pack.ZpPeqF/_new 2018-10-29 14:28:56.619020907 +0100
@@ -23,9 +23,9 @@
Summary: Time Zone Descriptions
# COMMON-BEGIN
# COMMON-BEGIN
-License: BSD-3-Clause and SUSE-Public-Domain
+License: BSD-3-Clause AND SUSE-Public-Domain
Group: System/Base
-Version: 2018e
+Version: 2018g
Release: 0
Source: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz
Source1: https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz
@@ -35,6 +35,7 @@
Source5: %{name}.changes
Patch0: tzdata-china.diff
Patch3: iso3166-uk.diff
+Patch4: timezone-2018f-bsc1112310.patch
# COMMON-END
# COMMON-END
Url: https://www.iana.org/time-zones
@@ -57,6 +58,7 @@
# COMMON-PREP-BEGIN
%patch0 -p1
%patch3 -p1
+%patch4 -p1
sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358]
# COMMON-PREP-END
# COMMON-PREP-END
++++++ timezone.spec ++++++
--- /var/tmp/diff_new_pack.ZpPeqF/_old 2018-10-29 14:28:56.631020269 +0100
+++ /var/tmp/diff_new_pack.ZpPeqF/_new 2018-10-29 14:28:56.635020056 +0100
@@ -18,12 +18,12 @@
Name: timezone
Summary: Time Zone Descriptions
-License: BSD-3-Clause and SUSE-Public-Domain
+License: BSD-3-Clause AND SUSE-Public-Domain
Group: System/Base
Url: http://www.iana.org/time-zones
PreReq: filesystem, coreutils
# COMMON-BEGIN
-Version: 2018e
+Version: 2018g
Release: 0
Source: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz
Source1: https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz
@@ -33,6 +33,7 @@
Source5: %{name}.changes
Patch0: tzdata-china.diff
Patch3: iso3166-uk.diff
+Patch4: timezone-2018f-bsc1112310.patch
# COMMON-END
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -50,6 +51,7 @@
# COMMON-PREP-BEGIN
%patch0 -p1
%patch3 -p1
+%patch4 -p1
sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358]
# COMMON-PREP-END
++++++ timezone-2018f-bsc1112310.patch ++++++
From: Andreas Stieger <astieger(a)suse.com>
References: https://bugzilla.suse.com/show_bug.cgi?id=1112310
Summary: avoid timezone-java build failures
Date: Thu, 18 Oct 2018 13:19:51 +0000
javazic is unable to parse the time zone data contained in 2018f:
https://github.com/eggert/tz/compare/2018e...2018f#diff-cffe819d4413b95dd8c…
- Rule Japan 1948 1951 - Sep Sun>=9 0:00 0 S
+ Rule Japan 1948 1951 - Sep Sat>=8 25:00 0 S
Base:System/timezone (timezone-java.spec) fails with:
[ 16s] + java -jar /usr/share/java/tzdb.jar -srcdir . -dstfile javazi/tzdb.dat africa antarctica asia australasia europe northamerica pacificnew southamerica backward etcetera systemv /usr/share/tzdb/tzdata_jdk/gmt /usr/share/tzdb/tzdata_jdk/jdk11_backward
[ 16s] Failed: java.lang.Exception: Failed while parsing file './asia' on line 1659 'Rule Japan 1948 1951 - Sep Sat>=8 25:00 0 S'
[ 16s] java.lang.Exception: Failed while parsing file './asia' on line 1659 'Rule Japan 1948 1951 - Sep Sat>=8 25:00 0S'
The bug is actually in Java. Use an alternative format to fix build.
Index: timezone-2018f/asia
===================================================================
--- timezone-2018f.orig/asia 2018-10-18 15:18:13.461299301 +0200
+++ timezone-2018f/asia 2018-10-18 15:23:20.330642692 +0200
@@ -1657,7 +1657,7 @@ Zone Asia/Jerusalem 2:20:54 - LMT 1880
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Japan 1948 only - May Sat>=1 24:00 1:00 D
-Rule Japan 1948 1951 - Sep Sat>=8 25:00 0 S
+Rule Japan 1948 1951 - Sep Sun>=9 1:00 0 S
Rule Japan 1949 only - Apr Sat>=1 24:00 1:00 D
Rule Japan 1950 1951 - May Sat>=1 24:00 1:00 D
++++++ tzdata-china.diff ++++++
--- /var/tmp/diff_new_pack.ZpPeqF/_old 2018-10-29 14:28:56.695016868 +0100
+++ /var/tmp/diff_new_pack.ZpPeqF/_new 2018-10-29 14:28:56.695016868 +0100
@@ -1,10 +1,10 @@
-Index: timezone-2017a/asia
+Index: timezone-2018f/asia
===================================================================
---- timezone-2017a.orig/asia 2017-03-01 09:14:03.177279465 +0100
-+++ timezone-2017a/asia 2017-03-01 09:14:05.141295116 +0100
-@@ -512,6 +512,10 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1:
+--- timezone-2018f.orig/asia 2018-10-03 02:21:28.000000000 +0200
++++ timezone-2018f/asia 2018-10-18 10:01:30.657962333 +0200
+@@ -566,6 +566,10 @@ Rule PRC 1987 1991 - Apr Sun>=11 2:00 1
Zone Asia/Shanghai 8:05:43 - LMT 1901
- 8:00 Shang C%sT 1949
+ 8:00 Shang C%sT 1949 May 28
8:00 PRC C%sT
+
+# Nowadays, China Standard Time is known as "Beijing Time"
@@ -13,11 +13,11 @@
# Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi
# / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.)
Zone Asia/Urumqi 5:50:20 - LMT 1928
-Index: timezone-2017a/backward
+Index: timezone-2018f/backward
===================================================================
---- timezone-2017a.orig/backward 2017-03-01 09:14:05.141295116 +0100
-+++ timezone-2017a/backward 2017-03-01 09:15:31.921986670 +0100
-@@ -95,7 +95,7 @@ Link America/Mexico_City Mexico/General
+--- timezone-2018f.orig/backward 2018-07-16 19:16:52.000000000 +0200
++++ timezone-2018f/backward 2018-10-18 10:01:30.657962333 +0200
+@@ -99,7 +99,7 @@ Link America/Mexico_City Mexico/General
Link Pacific/Auckland NZ
Link Pacific/Chatham NZ-CHAT
Link America/Denver Navajo
@@ -26,10 +26,10 @@
Link Pacific/Honolulu Pacific/Johnston
Link Pacific/Pohnpei Pacific/Ponape
Link Pacific/Pago_Pago Pacific/Samoa
-Index: timezone-2017a/zone.tab
+Index: timezone-2018f/zone.tab
===================================================================
---- timezone-2017a.orig/zone.tab 2017-03-01 09:14:03.177279465 +0100
-+++ timezone-2017a/zone.tab 2017-03-01 09:14:05.141295116 +0100
+--- timezone-2018f.orig/zone.tab 2018-06-27 20:24:09.000000000 +0200
++++ timezone-2018f/zone.tab 2018-10-18 10:01:30.657962333 +0200
@@ -145,6 +145,7 @@ CL -3327-07040 America/Santiago Chile (m
CL -5309-07055 America/Punta_Arenas Region of Magallanes
CL -2709-10926 Pacific/Easter Easter Island
1
0