Hello community,
here is the log from the commit of package obs-service-download_files for
openSUSE:Factory checked in at 2017-10-11 23:03:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-download_files (Old)
and /work/SRC/openSUSE:Factory/.obs-service-download_files.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-download_files"
Wed Oct 11 23:03:19 2017 rev:24 rq:533178 version:0.6.0.git.1502884469.0993a01
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-download_files/obs-service-download_files.changes
2016-03-17 16:47:59.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-download_files.new/obs-service-download_files.changes
2017-10-11 23:03:22.523586924 +0200
@@ -1,0 +2,6 @@
+Wed Aug 16 11:47:48 UTC 2017 - [email protected]
+
+- Update to version 0.6.0.git.1502883896.50fa599: (boo#1053984)
+ * make enforcement of IPv4 and SSL verification optional.
+
+-------------------------------------------------------------------
Old:
----
obs-service-download_files-0.5.1.git.1455712026.9c0a4a0.tar.gz
New:
----
obs-service-download_files-0.6.0.git.1502884469.0993a01.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-download_files.spec ++++++
--- /var/tmp/diff_new_pack.s9IW5D/_old 2017-10-11 23:03:23.179558184 +0200
+++ /var/tmp/diff_new_pack.s9IW5D/_new 2017-10-11 23:03:23.183558009 +0200
@@ -1,7 +1,7 @@
#
# spec file for package obs-service-download_files
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define service download_files
Name: obs-service-%{service}
-Version: 0.5.1.git.1455712026.9c0a4a0
+Version: 0.6.0.git.1502884469.0993a01
Release: 0
Summary: An OBS source service: download files
License: GPL-2.0+
@@ -50,6 +50,7 @@
%files
%defattr(-,root,root)
+%doc README.md
%dir %{_prefix}/lib/obs
%{_prefix}/lib/obs/service
%dir %{_sysconfdir}/obs
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.s9IW5D/_old 2017-10-11 23:03:23.243555380 +0200
+++ /var/tmp/diff_new_pack.s9IW5D/_new 2017-10-11 23:03:23.247555205 +0200
@@ -1,5 +1,5 @@
pkgname=obs-service-download_files
-pkgver=0.5.1.git.1455712026.9c0a4a0
+pkgver=0.6.0.git.1502884469.0993a01
pkgrel=0
pkgdesc="An OBS source service: download files"
arch=(any)
++++++ _service ++++++
--- /var/tmp/diff_new_pack.s9IW5D/_old 2017-10-11 23:03:23.275553978 +0200
+++ /var/tmp/diff_new_pack.s9IW5D/_new 2017-10-11 23:03:23.275553978 +0200
@@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="version">git-master</param>
- <param name="versionformat">0.5.1.git.%ct.%h</param>
+ <param name="versionformat">0.6.0.git.%ct.%h</param>
<param name="revision">master</param>
<param name="changesgenerate">enable</param>
</service>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.s9IW5D/_old 2017-10-11 23:03:23.295553101 +0200
+++ /var/tmp/diff_new_pack.s9IW5D/_new 2017-10-11 23:03:23.295553101 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">[email protected]:openSUSE/obs-service-download_files.git</param>
- <param
name="changesrevision">9c0a4a0eebd74a53e59a6a15059e5325f637088b</param>
+ <param
name="changesrevision">0993a0122648d67585df1c53c0375bbeaae5e4a8</param>
</service>
</servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.s9IW5D/_old 2017-10-11 23:03:23.335551349 +0200
+++ /var/tmp/diff_new_pack.s9IW5D/_new 2017-10-11 23:03:23.339551174 +0200
@@ -1,8 +1,8 @@
Format: 1.0
Source: obs-service-download-files
-Version: 0.5.1.git.1455712026.9c0a4a0
+Version: 0.6.0.git.1502884469.0993a01-0
Binary: obs-service-download-files
Maintainer: Hib Eris <[email protected]>
Architecture: all
Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7), libpath-class-perl,
libhttp-server-simple-perl, libfile-type-perl, libcgi-pm-perl, build |
obs-build, wget
++++++ obs-service-download_files-0.5.1.git.1455712026.9c0a4a0.tar.gz ->
obs-service-download_files-0.6.0.git.1502884469.0993a01.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-download_files-0.5.1.git.1455712026.9c0a4a0/README.md
new/obs-service-download_files-0.6.0.git.1502884469.0993a01/README.md
--- old/obs-service-download_files-0.5.1.git.1455712026.9c0a4a0/README.md
1970-01-01 01:00:00.000000000 +0100
+++ new/obs-service-download_files-0.6.0.git.1502884469.0993a01/README.md
2017-08-16 13:54:29.000000000 +0200
@@ -0,0 +1,6 @@
+# download_files (OBS source service)
+
+This is an [Open Build Service](http://openbuildservice.org/) source service.
It parses all spec files and downloads all Source files which are specified via
a http, https or ftp url.
+
+This is the git repository for
[openSUSE:Tools/obs-service-download_files](https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-download_files).
The authoritative source is
https://github.com/openSUSE/obs-service-download_files
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-download_files-0.5.1.git.1455712026.9c0a4a0/debian/changelog
new/obs-service-download_files-0.6.0.git.1502884469.0993a01/debian/changelog
---
old/obs-service-download_files-0.5.1.git.1455712026.9c0a4a0/debian/changelog
2016-02-17 14:38:20.000000000 +0100
+++
new/obs-service-download_files-0.6.0.git.1502884469.0993a01/debian/changelog
2017-08-16 13:54:29.000000000 +0200
@@ -1,3 +1,8 @@
+obs-service-download-files (0.6.0) stable; urgency=medium
+
+ * Enforce SSL verification
+
+ -- Adrian Schroeter <[email protected]> Wed, 16 Aug 2017 15:20:41 +0200
obs-service-download-files (0.5.1) stable; urgency=medium
* Initial release.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-download_files-0.5.1.git.1455712026.9c0a4a0/download_files
new/obs-service-download_files-0.6.0.git.1502884469.0993a01/download_files
--- old/obs-service-download_files-0.5.1.git.1455712026.9c0a4a0/download_files
2016-02-17 14:38:20.000000000 +0100
+++ new/obs-service-download_files-0.6.0.git.1502884469.0993a01/download_files
2017-08-16 13:54:29.000000000 +0200
@@ -14,39 +14,57 @@
CHANGES_GENERATE=disable
CHANGES_AUTHOR=""
CHANGES_LINES_MAX=30
+
+WGET="/usr/bin/wget --timeout=30 -q --tries=2 --no-directories"
+# We do not tell the server that we are an OBS tool by default anymore,
+# because too many sites just have a white list, but they accept wget
+# WGET="$WGET -U 'OBS-wget'"
+
while test $# -gt 0; do
case $1 in
- *-recompress)
+ --enforceipv4)
+ if [[ "$2" == "enable" ]]; then
+ WGET="$WGET -4"
+ fi
+ shift
+ ;;
+ --sslvalidation)
+ if [[ "$2" == "disable" ]]; then
+ NOSSLVALIDATION="yes"
+ fi
+ shift
+ ;;
+ --recompress)
if [[ "$2" == "yes" ]]; then
DORECOMPRESS="yes"
fi
shift
;;
- *-enforcelocal)
+ --enforcelocal)
if [[ "$2" == "yes" ]]; then
ENFORCELOCAL="yes"
fi
shift
;;
- *-enforceupstream)
+ --enforceupstream)
if [[ "$2" == "yes" ]]; then
ENFORCEUPSTREAM="yes"
fi
shift
;;
- *-outdir)
+ --outdir)
MYOUTDIR="$2"
shift
;;
- *-changesgenerate)
+ --changesgenerate)
CHANGES_GENERATE="$2"
shift
;;
- *-changesauthor)
+ --changesauthor)
CHANGES_AUTHOR="$2"
shift
;;
- *-changeslinesmax)
+ --changeslinesmax)
CHANGES_LINES_MAX="$2"
shift
;;
@@ -64,6 +82,10 @@
exit 1
fi
+if [[ -n "$NOSSLVALIDATION" ]]; then
+ WGET="$WGET --no-check-certificate"
+fi
+
function uncompress_file() {
local input=$1
local output=$2
@@ -201,7 +223,7 @@
test -e "$i" || continue
for url in `perl -I/usr/lib/build -MBuild -e Build::show $default_config
"$i" sources` `perl -I/usr/lib/build -MBuild -e Build::show $default_config
"$i" patches`; do
- WGET="/usr/bin/wget -4 --no-check-certificate --timeout=30 -q --tries=2
--no-directories"
+
MYCACHEDIRECTORY="$CACHEDIRECTORY"
PROTOCOL="${url%%:*}"
SAMEFILEAFTERCOMPRESSION=
@@ -209,11 +231,6 @@
BN=`basename "$url"`
- # We do not tell the server that we are an OBS tool by default anymore,
- # because too many sites just have a white list, but they accept wget
- # WGET="$WGET -U 'OBS-wget'"
-
-
cd "$MYOUTDIR"
# check local cache if configured
@@ -261,11 +278,9 @@
if [ -n "$RECOMPRESS" ]; then
tempfile=`mktemp`
file_name=`uncompress_file "$FILE" "$tempfile"`
- SKIP_RECOMPRESS=0
-
- old_file="$SRCDIR/${url##*/}"
-
- if [ -f $old_file ];then
+ SKIP_RECOMPRESS=0
+ old_file="$SRCDIR/${url##*/}"
+ if [ -f $old_file ];then
# uncompress the old file also to compare
tempoldfile=`mktemp`
uncompress_file "$old_file" "$tempoldfile" > /dev/null
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-download_files-0.5.1.git.1455712026.9c0a4a0/download_files.service
new/obs-service-download_files-0.6.0.git.1502884469.0993a01/download_files.service
---
old/obs-service-download_files-0.5.1.git.1455712026.9c0a4a0/download_files.service
2016-02-17 14:38:20.000000000 +0100
+++
new/obs-service-download_files-0.6.0.git.1502884469.0993a01/download_files.service
2017-08-16 13:54:29.000000000 +0200
@@ -6,6 +6,16 @@
<description>In case the right compression is not available on server, do
recompress the file as needed.</description>
<allowedvalue>yes</allowedvalue>
</parameter>
+ <parameter name="enforceipv4">
+ <description>Enforce IPv4 hostname resolution. This is currently the
default due to too many invalid configured servers.</description>
+ <allowedvalue>enable</allowedvalue>
+ <allowedvalue>disable</allowedvalue>
+ </parameter>
+ <parameter name="sslvalidation">
+ <description>Disable SSL verification on download.</description>
+ <allowedvalue>enable</allowedvalue>
+ <allowedvalue>disable</allowedvalue>
+ </parameter>
<parameter name="enforceupstream">
<description>Fail when upstream file differes to local committed file.
Package state will become "broken".</description>
<allowedvalue>yes</allowedvalue>
