Hello community, here is the log from the commit of package build for openSUSE:Factory checked in at 2017-11-30 12:31:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/build (Old) and /work/SRC/openSUSE:Factory/.build.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build" Thu Nov 30 12:31:59 2017 rev:111 rq:546366 version:20171128 Changes: -------- --- /work/SRC/openSUSE:Factory/build/build.changes 2017-11-19 11:07:43.527407054 +0100 +++ /work/SRC/openSUSE:Factory/.build.new/build.changes 2017-11-30 12:32:00.751106385 +0100 @@ -1,0 +2,15 @@ +Tue Nov 28 13:33:11 UTC 2017 - [email protected] + +- Fixed Dockerfile repository parsing +- Improve file name check extractbuild +- track release number of containers +- Define SOURCEURL and PATCHURL macros +- Keep preinstalled packages +- add libidn2 and libunistring to preinstall for archlinux + +------------------------------------------------------------------- +Tue Nov 21 09:12:41 UTC 2017 - [email protected] + +- buildignore the sle flavor of mkbaselibs for sle + +------------------------------------------------------------------- Old: ---- obs-build-20171117.tar.gz New: ---- debian.compat debian.rules obs-build-20171128.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build-mkbaselibs-sle.spec ++++++ --- /var/tmp/diff_new_pack.Ervdz1/_old 2017-11-30 12:32:01.951062748 +0100 +++ /var/tmp/diff_new_pack.Ervdz1/_new 2017-11-30 12:32:01.951062748 +0100 @@ -20,14 +20,18 @@ Summary: Tools to generate base lib packages License: GPL-2.0+ Group: Development/Tools/Building -Version: 20171117 +Version: 20171128 Release: 0 #!BuildIgnore: build-mkbaselibs +#!BuildIgnore: build-mkbaselibs-sle Provides: build-mkbaselibs Conflicts: otherproviders(build-mkbaselibs) Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +%if 0%{?is_opensuse} +ExclusiveArch: do-not-build +%endif %description This package contains the parts which may be installed in the inner build system ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.Ervdz1/_old 2017-11-30 12:32:01.995061148 +0100 +++ /var/tmp/diff_new_pack.Ervdz1/_new 2017-11-30 12:32:01.995061148 +0100 @@ -22,15 +22,12 @@ Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20171117 +Version: 20171128 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -%if 0%{?suse_version} > 1200 -# required for test suite -BuildRequires: build-mkbaselibs -%endif +#!BuildIgnore: build-mkbaselibs build-mkbaselibs-sle # Keep the following dependencies in sync with obs-worker package Requires: bash Requires: binutils @@ -206,6 +203,8 @@ echo "Skipping test case" exit 0 %endif +# we need to patch the not packaged configs, due to the buildignore +sed -i 's,build-mkbaselibs,,' ../configs/*.conf ./testbuild.sh /.build.binaries/ %files ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.Ervdz1/_old 2017-11-30 12:32:02.123056493 +0100 +++ /var/tmp/diff_new_pack.Ervdz1/_new 2017-11-30 12:32:02.127056348 +0100 @@ -1,5 +1,5 @@ pkgname=build -pkgver=20171117 +pkgver=20171128 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Ervdz1/_old 2017-11-30 12:32:02.163055039 +0100 +++ /var/tmp/diff_new_pack.Ervdz1/_new 2017-11-30 12:32:02.163055039 +0100 @@ -9,7 +9,9 @@ <param name="extract">dist/build-mkbaselibs-sle.spec</param> <param name="extract">dist/build.dsc</param> <param name="extract">dist/debian.changelog</param> + <param name="extract">dist/debian.compat</param> <param name="extract">dist/debian.control</param> + <param name="extract">dist/debian.rules</param> <param name="extract">dist/PKGBUILD</param> </service> <service name="recompress" mode="disabled"> ++++++ build.dsc ++++++ --- /var/tmp/diff_new_pack.Ervdz1/_old 2017-11-30 12:32:02.199053730 +0100 +++ /var/tmp/diff_new_pack.Ervdz1/_new 2017-11-30 12:32:02.203053584 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20171117 +Version: 20171128 Binary: build Maintainer: Adrian Schroeter <[email protected]> Architecture: all ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.Ervdz1/_old 2017-11-30 12:32:02.259051548 +0100 +++ /var/tmp/diff_new_pack.Ervdz1/_new 2017-11-30 12:32:02.263051402 +0100 @@ -1,4 +1,4 @@ -build (20171117) unstable; urgency=low +build (20171128) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection ++++++ debian.compat ++++++ 5 ++++++ debian.rules ++++++ #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # This file was originally written by Joey Hess and Craig Small. # As a special exception, when this file is copied by dh-make into a # dh-make output file, you may use that output file without restriction. # This special exception was added by Craig Small in version 0.37 of dh-make. # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany # This file and all modifications and additions to the pristine package # are under the same license as the package itself. # # Please submit bugfixes or commens via http://bugs.opensuse.org # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 SHELL=/bin/bash configure: configure-stamp configure-stamp: dh_testdir touch configure-stamp build: build-stamp build-stamp: configure-stamp dh_testdir touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp dh_clean install: build dh_testdir dh_testroot dh_clean -k dh_installdirs make DESTDIR=$(CURDIR)/debian/obs-build install binary-arch: build install dh_testdir dh_testroot dh_installchangelogs dh_installdocs dh_installexamples dh_installman dh_link dh_strip dh_compress dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary-indep: build install binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure ++++++ obs-build-20171117.tar.gz -> obs-build-20171128.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/Build/Docker.pm new/obs-build-20171128/Build/Docker.pm --- old/obs-build-20171117/Build/Docker.pm 2017-11-17 10:32:47.000000000 +0100 +++ new/obs-build-20171128/Build/Docker.pm 2017-11-28 14:28:12.000000000 +0100 @@ -54,14 +54,14 @@ return undef; } my ($projid, $repoid) = split('/', $prp, 2); - unshift @{$ret->{'repos'}}, {'project' => $projid, 'repository' => $repoid}; + unshift @{$ret->{'path'}}, {'project' => $projid, 'repository' => $repoid}; return; } else { # this is just for testing purposes... $url =~ s/^\/+$//; $url =~ s/:\//:/g; my @url = split('/', $url); - unshift @{$ret->{'repos'}}, {'project' => $url[-2], 'repository' => $url[-1]} if @url >= 2; + unshift @{$ret->{'path'}}, {'project' => $url[-2], 'repository' => $url[-1]} if @url >= 2; } return 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/Build/Kiwi.pm new/obs-build-20171128/Build/Kiwi.pm --- old/obs-build-20171117/Build/Kiwi.pm 2017-11-17 10:32:47.000000000 +0100 +++ new/obs-build-20171128/Build/Kiwi.pm 2017-11-28 14:28:12.000000000 +0100 @@ -392,6 +392,8 @@ my $d = parse({}, $fn); die("$d->{'error'}\n") if $d->{'error'}; $image =~ s/.*\/// if defined $image; + my $release; + $release = $1 if $image =~ /.*-Build(\d+\.\d+).*/; my @tags = map {"\"$_\""} @{$d->{'container_tags'} || []}; my @repos; for my $repo (@{$d->{'imagerepos'} || []}) { @@ -404,6 +406,7 @@ print "{\n"; print " \"name\": \"$d->{'name'}\""; print ",\n \"version\": \"$d->{'version'}\"" if defined $d->{'version'}; + print ",\n \"release\": \"$release\"" if defined $release; print ",\n \"tags\": [ ".join(', ', @tags)." ]" if @tags; print ",\n \"repos\": [ ".join(', ', @repos)." ]" if @repos; print ",\n \"file\": \"$image\"" if defined $image; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/Build/Rpm.pm new/obs-build-20171128/Build/Rpm.pm --- old/obs-build-20171117/Build/Rpm.pm 2017-11-17 10:32:47.000000000 +0100 +++ new/obs-build-20171128/Build/Rpm.pm 2017-11-28 14:28:12.000000000 +0100 @@ -588,6 +588,10 @@ } else { $ret->{$tag} = $val; } + if ($tag =~ /^(source|patch)(\d+)?$/) { + my $num = defined($2) ? $2 : ($1 eq 'source' ? 0 : -1); + $macros{uc($1) . "URL$num"} = $val if $num >= 0; + } } if ($line =~ /^\s*%package\s+(-n\s+)?(\S+)/) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/build-recipe-livebuild new/obs-build-20171128/build-recipe-livebuild --- old/obs-build-20171117/build-recipe-livebuild 2017-11-17 10:32:47.000000000 +0100 +++ new/obs-build-20171128/build-recipe-livebuild 2017-11-28 14:28:12.000000000 +0100 @@ -183,9 +183,9 @@ fi # Sanity check to not configure archives inside configuration - files=($BUILD_ROOT/$TOPDIR/$LIVEBUILD_ROOT/config/archives/*) + files=($BUILD_ROOT/$TOPDIR/$LIVEBUILD_ROOT/config/archives/*.chroot) if [ ${#files[@]} -gt 0 ]; then - cleanup_and_exit 1 "E: No configuration in config/archives/* allowed" + cleanup_and_exit 1 "E: No configuration in config/archives/*.chroot allowed" fi # TODO: Add the repository public key diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/build-vm-docker new/obs-build-20171128/build-vm-docker --- old/obs-build-20171117/build-vm-docker 2017-11-17 10:32:47.000000000 +0100 +++ new/obs-build-20171128/build-vm-docker 2017-11-28 14:28:12.000000000 +0100 @@ -49,7 +49,7 @@ if [ "$max_loop" = "0" ]; then max_loop=16 fi - for $num in `seq 0 $max_loop`; do + for num in `seq 0 $max_loop`; do test -b /dev/loop$num || mknod -m660 /dev/loop$num b 7 $num done } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/changelog2spec new/obs-build-20171128/changelog2spec --- old/obs-build-20171117/changelog2spec 2017-11-17 10:32:47.000000000 +0100 +++ new/obs-build-20171128/changelog2spec 2017-11-28 14:28:12.000000000 +0100 @@ -75,11 +75,11 @@ opendir(D, $dir) || die("$dir: $!\n"); my @changes = grep {/\.changes$/} readdir(D); closedir(D); + @changes = sort {length($a) <=> length($b) || $a cmp $b} @changes; # support _service: prefixes, they need to be stripped $file =~ s/^_service:.*://; my %changes = map {/^((?:_service:.*:)?(.*?))$/ ? ($2, $1) : ($_, $_)} @changes; @changes = keys %changes; - @changes = sort {length($a) <=> length($b) || $a cmp $b} @changes; exit(1) unless @changes; # nothing to do if (@changes > 1) { while ($file ne '') { @@ -243,10 +243,13 @@ # silly rpm can't hande dates < 1997, so we fold everything to # Thu Jan 02 1997 @gm = (0, 0, 0, 2, 0, 97, 4) if $gm[5] < 97 || ($gm[5] == 97 && $gm[4] == 0 && $gm[3] <= 1); + $gm[6] = $wday[$gm[6]]; + $gm[5] += 1900; + $gm[4] = $mon[$gm[4]]; if($fulltimestamps) { - printf("* %s %s %2d %02d:%02d:%02d UTC %4d %s\n", $wday[$gm[6]], $mon[$gm[4]], $gm[3], @gm[2,1,0], $gm[5] + 1900, $who); + printf("* %s %s %2d %02d:%02d:%02d UTC %4d %s\n", @gm[6,4,3,2,1,0,5], $who); } else { - printf("* %s %s %2d %4d %s\n", $wday[$gm[6]], $mon[$gm[4]], $gm[3], $gm[5] + 1900, $who); + printf("* %s %s %2d %4d %s\n", @gm[6,4,3,5], $who); } $changes =~ s/%/%%/g; $changes =~ s/^(\s*)%%(\S*)/$1\[%%$2\]/; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/configs/arch.conf new/obs-build-20171128/configs/arch.conf --- old/obs-build-20171117/configs/arch.conf 2017-11-17 10:32:47.000000000 +0100 +++ new/obs-build-20171128/configs/arch.conf 2017-11-28 14:28:12.000000000 +0100 @@ -4,7 +4,7 @@ Preinstall: gawk gzip filesystem curl libidn acl gpgme libarchive Preinstall: openssl libssh2 zlib libassuan libgpg-error attr Preinstall: expat xz bzip2 readline lzo krb5 e2fsprogs keyutils -Preinstall: ncurses lz4 libpsl icu gcc-libs libnghttp2 +Preinstall: ncurses lz4 libpsl icu gcc-libs libnghttp2 libidn2 libunistring VMinstall: util-linux libutil-linux binutils pcre libcap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/debian/compat new/obs-build-20171128/debian/compat --- old/obs-build-20171117/debian/compat 2017-11-17 10:32:47.000000000 +0100 +++ new/obs-build-20171128/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/debian/control new/obs-build-20171128/debian/control --- old/obs-build-20171117/debian/control 2017-11-17 10:32:47.000000000 +0100 +++ new/obs-build-20171128/debian/control 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -Source: build -Section: devel -Priority: optional -Maintainer: Adrian Schroeter <[email protected]> -Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.2 - -Package: obs-build -Architecture: all -Depends: ${perl:Depends}, rpm -Recommends: rpm2cpio -Conflicts: build -Replaces: build -Provides: build -Description: A script to build SUSE Linux RPMs - This package provides a script for building RPMs for SUSE Linux - in a chroot environment. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/debian/copyright new/obs-build-20171128/debian/copyright --- old/obs-build-20171117/debian/copyright 2017-11-17 10:32:47.000000000 +0100 +++ new/obs-build-20171128/debian/copyright 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -This package was debianized by Rene Engelhard <[email protected]> on -Thu, 22 Jun 2006 12:01:08 +0200. - -It was downloaded from http://software.opensuse.org/download/openSUSE:/Tools/SUSE_Linux_Factory/src - -Upstream authors: Thorsten Kukuk <[email protected]> - Michael Schr�ter <[email protected]> - Bernhard Kaindl <[email protected]> - Mad Martin Jorgensen <[email protected]> - Andreas Schwab <[email protected]> - R�diger Oertel <[email protected]> - Andreas Gruenbacher <[email protected]> - -Copyright: (c) 1997-2007 SuSE GmbH Nuernberg, Germany - -License: - -GPL - -The Debian packaging is (C) 2006, Rene Engelhard <[email protected]> and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/debian/docs new/obs-build-20171128/debian/docs --- old/obs-build-20171117/debian/docs 2017-11-17 10:32:47.000000000 +0100 +++ new/obs-build-20171128/debian/docs 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -README diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/debian/links new/obs-build-20171128/debian/links --- old/obs-build-20171117/debian/links 2017-11-17 10:32:47.000000000 +0100 +++ new/obs-build-20171128/debian/links 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -usr/bin/build usr/bin/obs-build -usr/lib/build usr/lib/obs-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/debian/rules new/obs-build-20171128/debian/rules --- old/obs-build-20171117/debian/rules 2017-11-17 10:32:47.000000000 +0100 +++ new/obs-build-20171128/debian/rules 1970-01-01 01:00:00.000000000 +0100 @@ -1,65 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany -# This file and all modifications and additions to the pristine package -# are under the same license as the package itself. -# -# Please submit bugfixes or commens via http://bugs.opensuse.org - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -SHELL=/bin/bash - -configure: configure-stamp -configure-stamp: - dh_testdir - touch configure-stamp - - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - make DESTDIR=$(CURDIR)/debian/obs-build install - -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_installman - dh_link - dh_strip - dh_compress - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-indep: build install - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/dist/build-mkbaselibs-sle.spec new/obs-build-20171128/dist/build-mkbaselibs-sle.spec --- old/obs-build-20171117/dist/build-mkbaselibs-sle.spec 2017-11-17 10:32:47.000000000 +0100 +++ new/obs-build-20171128/dist/build-mkbaselibs-sle.spec 2017-11-28 14:28:12.000000000 +0100 @@ -23,11 +23,15 @@ Version: 20170720 Release: 0 #!BuildIgnore: build-mkbaselibs +#!BuildIgnore: build-mkbaselibs-sle Provides: build-mkbaselibs Conflicts: otherproviders(build-mkbaselibs) Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +%if 0%{?is_opensuse} +ExclusiveArch: do-not-build +%endif %description This package contains the parts which may be installed in the inner build system diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/dist/build.changes new/obs-build-20171128/dist/build.changes --- old/obs-build-20171117/dist/build.changes 2017-11-17 10:32:47.000000000 +0100 +++ new/obs-build-20171128/dist/build.changes 2017-11-28 14:28:12.000000000 +0100 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Tue Nov 21 09:12:41 UTC 2017 - [email protected] + +- buildignore the sle flavor of mkbaselibs for sle + +------------------------------------------------------------------- +Fri Nov 17 09:36:04 UTC 2017 - [email protected] + +- prepare for suse_version 1550 in factory (by Dominique) + +------------------------------------------------------------------- Thu Nov 9 16:12:53 UTC 2017 - [email protected] - fixes syntax error fissile support diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/dist/build.spec new/obs-build-20171128/dist/build.spec --- old/obs-build-20171117/dist/build.spec 2017-11-17 10:32:47.000000000 +0100 +++ new/obs-build-20171128/dist/build.spec 2017-11-28 14:28:12.000000000 +0100 @@ -22,15 +22,12 @@ Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20170802 +Version: 20171122 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -%if 0%{?suse_version} > 1200 -# required for test suite -BuildRequires: build-mkbaselibs -%endif +#!BuildIgnore: build-mkbaselibs build-mkbaselibs-sle # Keep the following dependencies in sync with obs-worker package Requires: bash Requires: binutils @@ -206,6 +203,8 @@ echo "Skipping test case" exit 0 %endif +# we need to patch the not packaged configs, due to the buildignore +sed -i 's,build-mkbaselibs,,' ../configs/*.conf ./testbuild.sh /.build.binaries/ %files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/dist/debian.compat new/obs-build-20171128/dist/debian.compat --- old/obs-build-20171117/dist/debian.compat 1970-01-01 01:00:00.000000000 +0100 +++ new/obs-build-20171128/dist/debian.compat 2017-11-28 14:28:12.000000000 +0100 @@ -0,0 +1 @@ +5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/dist/debian.control new/obs-build-20171128/dist/debian.control --- old/obs-build-20171117/dist/debian.control 2017-11-30 12:32:02.543041220 +0100 +++ new/obs-build-20171128/dist/debian.control 2017-11-28 14:28:12.000000000 +0100 @@ -1 +1,18 @@ -symbolic link to ../debian/control +Source: build +Section: devel +Priority: optional +Maintainer: Adrian Schroeter <[email protected]> +Build-Depends: debhelper (>= 5) +Standards-Version: 3.7.2 + +Package: obs-build +Architecture: all +Depends: ${perl:Depends}, rpm +Recommends: rpm2cpio +Conflicts: build +Replaces: build +Provides: build +Description: A script to build SUSE Linux RPMs + This package provides a script for building RPMs for SUSE Linux + in a chroot environment. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/dist/debian.copyright new/obs-build-20171128/dist/debian.copyright --- old/obs-build-20171117/dist/debian.copyright 1970-01-01 01:00:00.000000000 +0100 +++ new/obs-build-20171128/dist/debian.copyright 2017-11-28 14:28:12.000000000 +0100 @@ -0,0 +1,21 @@ +This package was debianized by Rene Engelhard <[email protected]> on +Thu, 22 Jun 2006 12:01:08 +0200. + +It was downloaded from http://software.opensuse.org/download/openSUSE:/Tools/SUSE_Linux_Factory/src + +Upstream authors: Thorsten Kukuk <[email protected]> + Michael Schr�ter <[email protected]> + Bernhard Kaindl <[email protected]> + Mad Martin Jorgensen <[email protected]> + Andreas Schwab <[email protected]> + R�diger Oertel <[email protected]> + Andreas Gruenbacher <[email protected]> + +Copyright: (c) 1997-2007 SuSE GmbH Nuernberg, Germany + +License: + +GPL + +The Debian packaging is (C) 2006, Rene Engelhard <[email protected]> and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/dist/debian.docs new/obs-build-20171128/dist/debian.docs --- old/obs-build-20171117/dist/debian.docs 1970-01-01 01:00:00.000000000 +0100 +++ new/obs-build-20171128/dist/debian.docs 2017-11-28 14:28:12.000000000 +0100 @@ -0,0 +1 @@ +README diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/dist/debian.links new/obs-build-20171128/dist/debian.links --- old/obs-build-20171117/dist/debian.links 1970-01-01 01:00:00.000000000 +0100 +++ new/obs-build-20171128/dist/debian.links 2017-11-28 14:28:12.000000000 +0100 @@ -0,0 +1,2 @@ +usr/bin/build usr/bin/obs-build +usr/lib/build usr/lib/obs-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/dist/debian.rules new/obs-build-20171128/dist/debian.rules --- old/obs-build-20171117/dist/debian.rules 1970-01-01 01:00:00.000000000 +0100 +++ new/obs-build-20171128/dist/debian.rules 2017-11-28 14:28:12.000000000 +0100 @@ -0,0 +1,65 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany +# This file and all modifications and additions to the pristine package +# are under the same license as the package itself. +# +# Please submit bugfixes or commens via http://bugs.opensuse.org + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +SHELL=/bin/bash + +configure: configure-stamp +configure-stamp: + dh_testdir + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + make DESTDIR=$(CURDIR)/debian/obs-build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_installman + dh_link + dh_strip + dh_compress + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-indep: build install + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/download new/obs-build-20171128/download --- old/obs-build-20171117/download 2017-11-17 10:32:47.000000000 +0100 +++ new/obs-build-20171128/download 2017-11-28 14:28:12.000000000 +0100 @@ -20,9 +20,7 @@ # ################################################################ -use Net::SSL (); BEGIN { - $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0, unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build'); } @@ -39,7 +37,10 @@ my $ua = LWP::UserAgent->new( agent => "openSUSE build script", - timeout => 42); + timeout => 42, + ssl_opts => { + verify_hostname => 1 + }); for my $url (@ARGV) { if ($url =~ /^zypp:\/\/([^\/]*)\/?/) { @@ -60,7 +61,7 @@ } else { $url = URI->new($url); } - $ua->env_proxy if $url->scheme ne 'https'; + $ua->env_proxy; my $dest = "$dir/".basename($url->path); unlink($dest); # just in case my $retry = 3; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/extractbuild new/obs-build-20171128/extractbuild --- old/obs-build-20171117/extractbuild 2017-11-17 10:32:47.000000000 +0100 +++ new/obs-build-20171128/extractbuild 2017-11-28 14:28:12.000000000 +0100 @@ -74,6 +74,8 @@ my ($filetype, $file, $filesize, $blksize, @blocks) = split(/ /); die("invalid input '$_'\n") unless defined($file); $file =~ s/%([a-fA-F0-9]{2})/chr(hex($1))/ge; + die("bad file '$file' (contains \\0)\n") if $file =~ /\0/; + die("already processed: $file\n") if $done{$file}; die("bad file '$file'\n") if "/$file/" =~ /\/\.{0,2}\//s; if ($file =~ /^(.*)\//s) { die("file without directory: $file\n") unless $done{$1} && $done{$1} eq 'd'; @@ -88,6 +90,7 @@ my $target = $filesize; die("symlink without target\n") unless defined $target; $target =~ s/%([a-fA-F0-9]{2})/chr(hex($1))/ge; + die("bad symlink: $target (contains \\0)\n") if $target =~ /\0/; die("bad symlink: $target\n") if "/$target/" =~ /\/\.?\//s; if ("/$target/" =~ /^((?:\/\.\.)+)\/(.*?)$/s) { my ($head, $tail) = ($1, $2); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20171117/init_buildsystem new/obs-build-20171128/init_buildsystem --- old/obs-build-20171117/init_buildsystem 2017-11-17 10:32:47.000000000 +0100 +++ new/obs-build-20171128/init_buildsystem 2017-11-28 14:28:12.000000000 +0100 @@ -951,7 +951,7 @@ if test -f "$BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG" ; then read OLDPKGID < "$BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG" - if test "$PKGID" != "$OLDPKGID" ; then + if test "$PKGID" != "$OLDPKGID" && ! test -e "$BUILD_ROOT/.init_b_cache/preinstalls/$PKG" ; then echo "deleting unwanted ${OLDPKGID%% *}" pkg_erase else
