Hello community,
here is the log from the commit of package obs-service-download_files for
openSUSE:Factory checked in at 2018-07-07 22:02:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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"
Sat Jul 7 22:02:12 2018 rev:25 rq:621325 version:0.6.1.git.1529965817.d9a3ff4
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-download_files/obs-service-download_files.changes
2017-10-11 23:03:22.523586924 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-download_files.new/obs-service-download_files.changes
2018-07-07 22:02:23.867013720 +0200
@@ -1,0 +2,34 @@
+Fri Jun 29 11:57:02 UTC 2018 - [email protected]
+
+- update to new tag 0.6.1
+ * changed _service to @PARENT_TAG@
+ * swap wget parameters
+ * remove unset urlextension variable
+ * remove unused BN
+ * remove leftover partial file when wget fails
+ * Add missing build-dependencies to d/control
+ * [dist] replace shebang to get rid error while building package
+ * [dist] remove obsrun user and cachedir from package
+
+-------------------------------------------------------------------
+Mon Jun 25 13:18:21 UTC 2018 - [email protected]
+
+- Update to version 0.6.0.git.1529932613.88b8b29:
+ * [dist] remove obsrun user and cachedir from package
+ * [dist] migrate spec file from OBS to git repo
+ * debian changelog entry
+ * make enforcement of IPv4 and SSL verification optional.
+ * Add README.md file
+ * fixes #6
+ * added gitignore
+ * [testing] better handling for files in download server
+ * fixed tabs
+ * fixed recompression and started with automated testing
+
+-------------------------------------------------------------------
+Mon Jun 25 13:10:16 UTC 2018 - [email protected]
+
+- Update to version 0.6.0.git.1529932093.f836107:
+ * [dist] migrate spec file from OBS to git repo
+
+-------------------------------------------------------------------
Old:
----
obs-service-download_files-0.6.0.git.1502884469.0993a01.tar.gz
New:
----
obs-service-download_files-0.6.1.git.1529965817.d9a3ff4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-download_files.spec ++++++
--- /var/tmp/diff_new_pack.glvRKQ/_old 2018-07-07 22:02:24.299013173 +0200
+++ /var/tmp/diff_new_pack.glvRKQ/_new 2018-07-07 22:02:24.303013169 +0200
@@ -1,7 +1,7 @@
#
# spec file for package obs-service-download_files
#
-# 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
@@ -18,10 +18,10 @@
%define service download_files
Name: obs-service-%{service}
-Version: 0.6.0.git.1502884469.0993a01
+Version: 0.6.1.git.1529965817.d9a3ff4
Release: 0
Summary: An OBS source service: download files
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: Development/Tools/Building
Url: https://github.com/openSUSE/obs-service-%{service}
Source: %{name}-%{version}.tar.gz
@@ -40,14 +40,11 @@
%setup -q
%build
+perl -p -i -e "s{#!/usr/bin/env bash}{#!/bin/bash}" download_files
%install
%makeinstall
-%pre
-%{_sbindir}/groupadd -r obsrun 2> /dev/null || :
-%{_sbindir}/useradd -r -s /bin/false -c "User for build service backend" -d
%{_prefix}/lib/obs -g obsrun obsrun 2> /dev/null || :
-
%files
%defattr(-,root,root)
%doc README.md
@@ -56,10 +53,5 @@
%dir %{_sysconfdir}/obs
%dir %{_sysconfdir}/obs/services
%config(noreplace) %{_sysconfdir}/obs/services/*
-%dir %{_localstatedir}/cache/obs
-%defattr(-,obsrun,obsrun)
-%dir %{_localstatedir}/cache/obs/download_files
-%dir %{_localstatedir}/cache/obs/download_files/file
-%dir %{_localstatedir}/cache/obs/download_files/filename
%changelog
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.glvRKQ/_old 2018-07-07 22:02:24.327013138 +0200
+++ /var/tmp/diff_new_pack.glvRKQ/_new 2018-07-07 22:02:24.331013134 +0200
@@ -1,12 +1,12 @@
pkgname=obs-service-download_files
-pkgver=0.6.0.git.1502884469.0993a01
+pkgver=0.6.1.git.1529965817.d9a3ff4
pkgrel=0
pkgdesc="An OBS source service: download files"
arch=(any)
license=(GPL-2.0+)
url=https://github.com/openSUSE/$pkgname
source=($pkgname-$pkgver.tar.gz)
-sha256sums=('2cd091892773cd1a40b0f728bc5786afbdeeefae98603db089ba6c80b181bf95')
+sha256sums=('SKIP')
depends=('build>=2012.08.24' diffutils wget)
package() {
++++++ _service ++++++
--- /var/tmp/diff_new_pack.glvRKQ/_old 2018-07-07 22:02:24.343013118 +0200
+++ /var/tmp/diff_new_pack.glvRKQ/_new 2018-07-07 22:02:24.347013113 +0200
@@ -1,12 +1,13 @@
<services>
<service mode="disabled" name="tar_scm">
<param
name="url">[email protected]:openSUSE/obs-service-download_files.git</param>
+ <param name="revision">master</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="version">git-master</param>
- <param name="versionformat">0.6.0.git.%ct.%h</param>
- <param name="revision">master</param>
+ <param name="versionformat">@[email protected].%ct.%h</param>
<param name="changesgenerate">enable</param>
+ <param name="extract">dist/obs-service-download_files.spec</param>
</service>
<service mode="disabled" name="recompress">
<param name="file">*.tar</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.glvRKQ/_old 2018-07-07 22:02:24.359013098 +0200
+++ /var/tmp/diff_new_pack.glvRKQ/_new 2018-07-07 22:02:24.363013093 +0200
@@ -1,6 +1,8 @@
<servicedata>
<service name="tar_scm">
<param
name="url">[email protected]:openSUSE/obs-service-download_files.git</param>
- <param
name="changesrevision">0993a0122648d67585df1c53c0375bbeaae5e4a8</param>
+ <param
name="changesrevision">d9a3ff4f71de1bfe8ca64813d7b0fd2b09ababa4</param>
</service>
-</servicedata>
\ No newline at end of file
+<service name="tar_scm">
+ <param
name="url">https://github.com/M0ses/obs-service-download_files.git</param>
+ <param
name="changesrevision">88b8b293a897b384a98cdbc13a667f2baa4bb3a6</param></service></servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.glvRKQ/_old 2018-07-07 22:02:24.375013078 +0200
+++ /var/tmp/diff_new_pack.glvRKQ/_new 2018-07-07 22:02:24.375013078 +0200
@@ -1,8 +1,14 @@
Format: 1.0
Source: obs-service-download-files
-Version: 0.6.0.git.1502884469.0993a01-0
+Version: 0.6.1.git.1529965817.d9a3ff4-0
Binary: obs-service-download-files
Maintainer: Hib Eris <[email protected]>
Architecture: all
Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 7), libpath-class-perl,
libhttp-server-simple-perl, libfile-type-perl, libcgi-pm-perl, build |
obs-build, wget
+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.6.0.git.1502884469.0993a01.tar.gz ->
obs-service-download_files-0.6.1.git.1529965817.d9a3ff4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-download_files-0.6.0.git.1502884469.0993a01/Makefile
new/obs-service-download_files-0.6.1.git.1529965817.d9a3ff4/Makefile
--- old/obs-service-download_files-0.6.0.git.1502884469.0993a01/Makefile
2017-08-16 13:54:29.000000000 +0200
+++ new/obs-service-download_files-0.6.1.git.1529965817.d9a3ff4/Makefile
2018-06-26 00:30:17.000000000 +0200
@@ -14,8 +14,6 @@
install -m 0644 download_files.service $(DESTDIR)$(servicedir)
install -d $(DESTDIR)$(serviceconfdir)
install -m 0644 download_files.rc
$(DESTDIR)$(serviceconfdir)/download_files
- install -d $(DESTDIR)$(servicecachedir)/download_files/file
- install -d $(DESTDIR)$(servicecachedir)/download_files/filename
test:
prove -v t/*.t
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-download_files-0.6.0.git.1502884469.0993a01/debian/control
new/obs-service-download_files-0.6.1.git.1529965817.d9a3ff4/debian/control
--- old/obs-service-download_files-0.6.0.git.1502884469.0993a01/debian/control
2017-08-16 13:54:29.000000000 +0200
+++ new/obs-service-download_files-0.6.1.git.1529965817.d9a3ff4/debian/control
2018-06-26 00:30:17.000000000 +0200
@@ -2,7 +2,13 @@
Maintainer: Hib Eris <[email protected]>
Section: devel
Priority: extra
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7),
+ build | obs-build,
+ libcgi-pm-perl,
+ libfile-type-perl,
+ libhttp-server-simple-perl,
+ libpath-class-perl,
+ wget,
Standards-Version: 3.9.6
Homepage: https://github.com/openSUSE/obs-service-download_files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-download_files-0.6.0.git.1502884469.0993a01/dist/obs-service-download_files.spec
new/obs-service-download_files-0.6.1.git.1529965817.d9a3ff4/dist/obs-service-download_files.spec
---
old/obs-service-download_files-0.6.0.git.1502884469.0993a01/dist/obs-service-download_files.spec
1970-01-01 01:00:00.000000000 +0100
+++
new/obs-service-download_files-0.6.1.git.1529965817.d9a3ff4/dist/obs-service-download_files.spec
2018-06-26 00:30:17.000000000 +0200
@@ -0,0 +1,57 @@
+#
+# spec file for package obs-service-download_files
+#
+# 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
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# 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/
+#
+
+
+%define service download_files
+Name: obs-service-%{service}
+Version: 0.6.0
+Release: 0
+Summary: An OBS source service: download files
+License: GPL-2.0-or-later
+Group: Development/Tools/Building
+Url: https://github.com/openSUSE/obs-service-%{service}
+Source: %{name}-%{version}.tar.gz
+Requires: build >= 2012.08.24
+Requires: diffutils
+Requires: wget
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
+
+%description
+This is a source service for openSUSE Build Service.
+
+This service is parsing all spec files and downloads all Source files which
are specified via a http, https or ftp url.
+
+%prep
+%setup -q
+
+%build
+perl -p -i -e "s{#!/usr/bin/env bash}{#!/bin/bash}" download_files
+
+%install
+%makeinstall
+
+%files
+%defattr(-,root,root)
+%doc README.md
+%dir %{_prefix}/lib/obs
+%{_prefix}/lib/obs/service
+%dir %{_sysconfdir}/obs
+%dir %{_sysconfdir}/obs/services
+%config(noreplace) %{_sysconfdir}/obs/services/*
+
+%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-download_files-0.6.0.git.1502884469.0993a01/download_files
new/obs-service-download_files-0.6.1.git.1529965817.d9a3ff4/download_files
--- old/obs-service-download_files-0.6.0.git.1502884469.0993a01/download_files
2017-08-16 13:54:29.000000000 +0200
+++ new/obs-service-download_files-0.6.1.git.1529965817.d9a3ff4/download_files
2018-06-26 00:30:17.000000000 +0200
@@ -229,8 +229,6 @@
SAMEFILEAFTERCOMPRESSION=
[[ "${PROTOCOL}" != "http" && "${PROTOCOL}" != "https" && "${PROTOCOL}" !=
"ftp" ]] && continue
- BN=`basename "$url"`
-
cd "$MYOUTDIR"
# check local cache if configured
@@ -243,7 +241,9 @@
cp -a -- "$MYCACHEDIRECTORY/file/$HASH" ./"$FILE"
elif [ -z "$DORECOMPRESS" ]; then
FILE="${url##*/}"
- if ! $WGET "$url$urlextension" -O "$FILE"; then
+
+ if ! $WGET -O "$FILE" -- "$url"; then
+ rm -f "$FILE"
echo "ERROR: Failed to download \"$url\""
exit 1
fi
@@ -252,7 +252,7 @@
FILE="${url##*/}"
FORMAT="${url##*\.}"
- if $WGET "$url" -O "$FILE"; then
+ if $WGET -O "$FILE" -- "$url"; then
RECOMPRESS=
elif $WGET "${url%\.$FORMAT}.gz" -O "${FILE%\.$FORMAT}.gz"; then
RECOMPRESS="$FORMAT"
