From 9afae53e78536f4083e98e245938356f21e8dfb794b16b1bea4e8238ab5c2f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 23 Jan 2018 14:05:54 +0000 Subject: [PATCH 1/2] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=345 --- PKGBUILD | 2 +- build-mkbaselibs-sle.spec | 12 ++++++------ build.changes | 12 ++++++++++++ build.dsc | 2 +- build.spec | 20 ++++++++++---------- debian.changelog | 2 +- obs-build-20171128.tar.gz | 3 --- obs-build-20180123.tar.gz | 3 +++ 8 files changed, 34 insertions(+), 22 deletions(-) delete mode 100644 obs-build-20171128.tar.gz create mode 100644 obs-build-20180123.tar.gz diff --git a/PKGBUILD b/PKGBUILD index e70e5f4..4fdc58c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20171128 +pkgver=20180123 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 86e64f5..636c0fb 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -1,7 +1,7 @@ # # spec file for package build-mkbaselibs-sle # -# 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 @@ -20,7 +20,7 @@ Name: build-mkbaselibs-sle Summary: Tools to generate base lib packages License: GPL-2.0+ Group: Development/Tools/Building -Version: 20171128 +Version: 20180123 Release: 0 #!BuildIgnore: build-mkbaselibs #!BuildIgnore: build-mkbaselibs-sle @@ -45,13 +45,13 @@ This is the SLE variant including IA64 binary generation. %build %install -install -m 0755 -d $RPM_BUILD_ROOT/usr/lib/build +install -m 0755 -d %{buildroot}/usr/lib/build install -m 0755 mkbaselibs \ - $RPM_BUILD_ROOT/usr/lib/build/mkbaselibs + %{buildroot}/usr/lib/build/mkbaselibs install -m 0644 baselibs_configs/baselibs_global-deb.conf \ - $RPM_BUILD_ROOT/usr/lib/build/baselibs_global-deb.conf + %{buildroot}/usr/lib/build/baselibs_global-deb.conf install -m 0644 baselibs_configs/baselibs_global.conf \ - $RPM_BUILD_ROOT/usr/lib/build/baselibs_global.conf + %{buildroot}/usr/lib/build/baselibs_global.conf %files %defattr(-,root,root) diff --git a/build.changes b/build.changes index c0fbee5..d5e31b7 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 23 14:03:50 UTC 2018 - adrian@suse.de + +- Remove pam-modules for SLE and Leap 15 +- Do not leak conflicts/obsoletes into the next package for skipped packages +- Fix rpm detection and createrepo code in build-recipe-appimage + ------------------------------------------------------------------- Tue Nov 28 13:33:11 UTC 2017 - adrian@suse.de @@ -684,6 +691,11 @@ Tue Mar 1 15:35:21 UTC 2011 - adrian@suse.de - support new cross build initvm. Done by James Perkins from LinuxFoundation - do not use loop device anymore when using block devices directly +------------------------------------------------------------------- +Thu Jan 20 10:18:09 UTC 2011 - lnussel@suse.de + +- force use of bsdtar for VMs (bnc#665768, CVE-2010-4226) + ------------------------------------------------------------------- Thu Nov 11 12:24:13 UTC 2010 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 2deda53..c8b8506 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20171128 +Version: 20180123 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 99126b3..f027ae1 100644 --- a/build.spec +++ b/build.spec @@ -1,7 +1,7 @@ # # spec file for package build # -# 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 @@ -22,7 +22,7 @@ Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20171128 +Version: 20180123 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -124,18 +124,18 @@ make CFLAGS="$RPM_BUILD_FLAGS" initvm-all %install # initvm %if 0%{?suse_version} -make DESTDIR=$RPM_BUILD_ROOT initvm-install -strip $RPM_BUILD_ROOT/usr/lib/build/initvm.* +make DESTDIR=%{buildroot} initvm-install +strip %{buildroot}/usr/lib/build/initvm.* export NO_BRP_STRIP_DEBUG="true" -chmod 0644 $RPM_BUILD_ROOT/usr/lib/build/initvm.* +chmod 0644 %{buildroot}/usr/lib/build/initvm.* %endif # main -make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=%{buildroot} install # tweak default config on suse %if 0%{?suse_version} -cd $RPM_BUILD_ROOT/usr/lib/build/configs/ +cd %{buildroot}/usr/lib/build/configs/ SUSE_V=%{?suse_version} SLE_V=%{?sle_version} %if 0%{?sle_version} && 0%{?is_opensuse} && %suse_version == 1315 @@ -164,7 +164,7 @@ test -e default.conf || exit 1 # tweak baselibs config on suse %if 0%{?suse_version} -cd $RPM_BUILD_ROOT/usr/lib/build +cd %{buildroot}/usr/lib/build %if %suse_version == 1500 # SLE 15 / Leap 15 ln -sf baselibs_configs/baselibs_global-sle15.conf baselibs_global.conf @@ -181,12 +181,12 @@ if [ `whoami` != "root" ]; then echo "WARNING: Not building as root, tests did not run!" exit 0 fi -if [ ! -f "$RPM_BUILD_ROOT/usr/lib/build/configs/default.conf" ]; then +if [ ! -f "%{buildroot}/usr/lib/build/configs/default.conf" ]; then echo "WARNING: No default config, tests did not run!" exit 0 fi # get back the default.conf link -cp -av $RPM_BUILD_ROOT/usr/lib/build/configs/default.conf configs/ +cp -av %{buildroot}/usr/lib/build/configs/default.conf configs/ # do not get confused when building this already with build: export BUILD_IGNORE_2ND_STAGE=1 # use our own build code diff --git a/debian.changelog b/debian.changelog index 3bb441b..8fb7694 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20171128) unstable; urgency=low +build (20180123) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20171128.tar.gz b/obs-build-20171128.tar.gz deleted file mode 100644 index 6c2016a..0000000 --- a/obs-build-20171128.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:698a72371ef207fe4891514d8d7c544cddaffa10c3713844b7cc683b0fab8556 -size 312292 diff --git a/obs-build-20180123.tar.gz b/obs-build-20180123.tar.gz new file mode 100644 index 0000000..2fdbd71 --- /dev/null +++ b/obs-build-20180123.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85d8afd36739867228884826597a43d20090f3ead45a605433a2e1036ab2729f +size 312820 From 4556c37bdba41fbc52306ccbddb8133cdc2f26fab7c70ef2361ea54a67bae1ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 24 Jan 2018 16:07:16 +0000 Subject: [PATCH 2/2] fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=346 --- PKGBUILD | 2 +- build-mkbaselibs-sle.spec | 2 +- build.changes | 6 ++---- build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20180123.tar.gz | 3 --- obs-build-20180124.tar.gz | 3 +++ 8 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 obs-build-20180123.tar.gz create mode 100644 obs-build-20180124.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 4fdc58c..a2afea0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20180123 +pkgver=20180124 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 636c0fb..44a0022 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -20,7 +20,7 @@ Name: build-mkbaselibs-sle Summary: Tools to generate base lib packages License: GPL-2.0+ Group: Development/Tools/Building -Version: 20180123 +Version: 20180124 Release: 0 #!BuildIgnore: build-mkbaselibs #!BuildIgnore: build-mkbaselibs-sle diff --git a/build.changes b/build.changes index d5e31b7..8702e0a 100644 --- a/build.changes +++ b/build.changes @@ -1,9 +1,7 @@ ------------------------------------------------------------------- -Tue Jan 23 14:03:50 UTC 2018 - adrian@suse.de +Wed Jan 24 16:04:35 UTC 2018 - adrian@suse.de -- Remove pam-modules for SLE and Leap 15 -- Do not leak conflicts/obsoletes into the next package for skipped packages -- Fix rpm detection and createrepo code in build-recipe-appimage +- Fix picking of right changes file for changelog generation (boo#1077145) ------------------------------------------------------------------- Tue Nov 28 13:33:11 UTC 2017 - adrian@suse.de diff --git a/build.dsc b/build.dsc index c8b8506..7ad811e 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20180123 +Version: 20180124 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index f027ae1..85e0092 100644 --- a/build.spec +++ b/build.spec @@ -22,7 +22,7 @@ Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20180123 +Version: 20180124 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index 8fb7694..ee6c6f5 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20180123) unstable; urgency=low +build (20180124) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20180123.tar.gz b/obs-build-20180123.tar.gz deleted file mode 100644 index 2fdbd71..0000000 --- a/obs-build-20180123.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:85d8afd36739867228884826597a43d20090f3ead45a605433a2e1036ab2729f -size 312820 diff --git a/obs-build-20180124.tar.gz b/obs-build-20180124.tar.gz new file mode 100644 index 0000000..edde242 --- /dev/null +++ b/obs-build-20180124.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d5f3d1e390ef1b16014590f15b78936a2341ecf5d8a9cd3e70e170722237127 +size 331007