From a658f51222cc78963b7906f2f8f8a271a3b3a0d8 Mon Sep 17 00:00:00 2001 From: Clark Williams Date: Nov 01 2012 20:50:55 +0000 Subject: add updates-testing stanza to fedora-1x-*.cfg [BZ# 610826] - modify scrub to handle non-existant chroots [BZ# 860368] --- diff --git a/mock.spec b/mock.spec index 5c66618..e55fe7d 100644 --- a/mock.spec +++ b/mock.spec @@ -1,7 +1,7 @@ # next four lines substituted by autoconf %define major 1 -%define minor 0 -%define sub 36 +%define minor 1 +%define sub 28 %define extralevel %{nil} %define release_name mock %define release_version %{major}.%{minor}.%{sub}%{extralevel} @@ -18,7 +18,7 @@ Source: https://git.fedorahosted.org/cgit/mock.git/snapshot/%{name}-%{version}.t URL: http://fedoraproject.org/wiki/Projects/Mock BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: python >= 2.4, yum >= 2.4, yum-utils >= 1.1.9, tar, pigz, python-ctypes, python-decoratortools, usermode +Requires: python >= 2.6, yum >= 2.4, yum-utils >= 1.1.9, tar, pigz, python-ctypes, python-decoratortools, usermode Requires: createrepo Requires(pre): shadow-utils Requires(post): coreutils @@ -56,8 +56,10 @@ ln -s fedora-rawhide-x86_64.cfg fedora-devel-x86_64.cfg ln -s fedora-rawhide-ppc.cfg fedora-devel-ppc.cfg ln -s fedora-rawhide-ppc64.cfg fedora-devel-ppc64.cfg popd +echo "%defattr(0644, root, mock)" > %{name}.cfgs find $RPM_BUILD_ROOT%{_sysconfdir}/mock -name "*.cfg" \ - | sed -e "s|^$RPM_BUILD_ROOT|%%config(noreplace) |" > %{name}.cfgs + | sed -e "s|^$RPM_BUILD_ROOT|%%config(noreplace) |" >> %{name}.cfgs + # just for %%ghosting purposes ln -s fedora-rawhide-x86_64.cfg $RPM_BUILD_ROOT%{_sysconfdir}/mock/default.cfg @@ -72,11 +74,13 @@ fi %post # TODO: use dist and version of install system, not build one if [ ! -e %{_sysconfdir}/%{name}/default.cfg ] ; then + # in case of dangling symlink + rm -f %{_sysconfdir}/%{name}/default.cfg arch=$(uname -i) for ver in %{?fedora}%{?rhel} rawhide ; do cfg=%{?fedora:fedora}%{?rhel:epel}-$ver-$arch.cfg if [ -e %{_sysconfdir}/%{name}/$cfg ] ; then - ln -s $cfg %{_sysconfdir}/%{name}/default.cfg + ln -s -f $cfg %{_sysconfdir}/%{name}/default.cfg exit 0 fi done @@ -102,6 +106,7 @@ chmod 2775 /var/cache/mock %config(noreplace) %{_sysconfdir}/%{name}/*.ini %config(noreplace) %{_sysconfdir}/pam.d/%{name} %config(noreplace) %{_sysconfdir}/security/console.apps/%{name} +%{_sysconfdir}/bash_completion.d # docs %{_mandir}/man1/mock.1* @@ -112,13 +117,13 @@ chmod 2775 /var/cache/mock %defattr(0775, root, mock, 02775) %dir /var/cache/mock %dir /var/lib/mock - + %changelog -* Thu Nov 1 2012 Clark Williams - 1.0.36-1 +* Mon Sep 24 2012 Clark Williams - 1.1.28-1 - add updates-testing stanza to fedora-1x-*.cfg [BZ# 610826] - modify scrub to handle non-existant chroots [BZ# 860368] -* Fri Sep 7 2012 Clark Williams - 1.0.35-1 +* Fri Sep 7 2012 Clark Williams - 1.1.27-1 - fixed configs test report to indicate configuration failure total - remove dead code, unused array 'legal_arches' - add an 'age_check' parameter to root_cache @@ -130,18 +135,18 @@ chmod 2775 /var/cache/mock - from Colin Walters : - add CLONE_NEWPID and CLONE_NEWIPC to unshare call [BZ# 851340] -* Mon Aug 6 2012 Clark Williams - 1.0.34-1 -- moved fedora-17-ppc* configs into config directory +* Fri Aug 10 2012 Dennis Gilmore - 1.1.26-2 +- add f18 configs +- add rawhide s390 config -* Wed Aug 1 2012 Clark Williams - 1.0.33-1 -- revert the commit which added CLONE_NEWUTS to the unshare(2) - call; the 2.6.18 el5 kernel does not support it [BZ# 844846] +* Mon Aug 6 2012 Clark Williams - 1.1.26-1 +- move the fedora-17-ppc* configs into the configs directory -* Tue Jul 31 2012 Clark Williams - 1.0.32-1 +* Tue Jul 31 2012 Clark Williams - 1.1.25-1 - From Karsten Hopp : - added ppc and ppc64 configs for fedora 17 -* Fri Jul 27 2012 Clark Williams - 1.0.31-1 +* Fri Jul 27 2012 Clark Williams - 1.1.24-1 - Fixed error when calling os.getlogin() [BZ# 843434] - removed fedora-15 config files - from Matt McCutchen : @@ -151,7 +156,7 @@ chmod 2775 /var/cache/mock - from Seth Vidal : - added package_state_plugin -* Thu Jun 21 2012 Clark Williams - 1.0.30-1 +* Thu Jun 7 2012 Clark Williams - 1.1.23-1 - modified startup code to only set mock group [BZ# 809676] - add CLONE_NEWUTS to unshare(2) call [BZ# 818445] - from Seth Vidal : @@ -161,47 +166,36 @@ chmod 2775 /var/cache/mock - from Masatake YAMATO : - added option to set a plugin parameter value [BZ# 754321] -* Thu Mar 29 2012 Clark Williams - 1.0.29-1 +* Thu Mar 29 2012 Clark Williams - 1.1.22-1 - fix SCM problem with SSH_AUTH_SOCK [BZ# 803217] -- remove EPEL 4 configs -- fix baseurl (remove dist-) for f17 configs [BZ# 795409] -- fix incorrect setting of gid in UidManager.changeOwner() [BZ# 782449] - From Chris St Pierre : - - allow chroot group to be configure option [BZ# 719099] + - allow chroot group to be configure option -* Wed Feb 8 2012 Clark Williams - 1.0.28-1 -- From Dennis Gilmore +* Wed Feb 8 2012 Clark Williams - 1.1.21-1 +- from Dennis Gilmore - add Fedora 17 mock configs - have configs reflect the dropping of dist- for koji repos - add configs for arm hardware floating point -* Wed Feb 1 2012 Clark Williams - 1.0.27-1 -- change [local] repo definition for f16+ configs [BZ# 753735] -- don't run createrepo inside chroot [BZ# 783926] +* Mon Jan 30 2012 Clark Williams - 1.1.20-1 +- changed createrepo invocation to not be done inside the chroot [BZ# 783926] +- changed [local] repo definitions in f16+ configs [BZ# 753735] - from Ville Skyttä - - llow setting https, ftp, and no proxy in addition to http. + - Allow setting https, ftp, and no proxy in addition to http. -* Sat Jan 14 2012 Clark Williams - 1.0.26-2 -- fix missing source files in Makefile.am +* Mon Jan 2 2012 Clark Williams - 1.1.19-2 +- fix missing files from Makefile.am -* Fri Jan 13 2012 Clark Williams - 1.0.26-1 -- added header output for test sections -- Added a mount plugin for handling additional user-specified mounts. -- modify do_rebuild() to use chroot function doChroot() -- move mount management into classes +* Mon Jan 2 2012 Clark Williams - 1.1.19-1 +- fix dangling symlink when using SCM [BZ# 758781] - remove setting TMPDIR in chroot environment [BZ# 769728] - add code to allow global proxy in chroot [BZ# 766199] - explicitly set unprivileged umask in --shell [BZ# 747119] - add bind-mount config to create sourcedirs [BZ# 706174] -From Marko Myllynen : - - Allow mock repos to use yum priorities [BZ# 771604] -From Alfred : - - fix dangling symlink when using SCM [BZ# 758781] -From Ville Skyttä : - - Get rid of chrootEnvUpdate, just update backend env directly, and always pass it. - - Log env when executing commands. - -* Sun Nov 27 2011 Clark Williams - 1.0.25-1 +- move mount management into classes +- update environment management code + +* Sat Nov 26 2011 Clark Williams - 1.1.18-1 - modify creation of default.cfg link to force creation if the symlink exists but doesn't point to a valid config [BZ# 741145] - remove TZ from default environment [BZ# 754701] @@ -217,14 +211,14 @@ From Ville Skyttä : - from Davi Arnaut - set chroot environment variables from config files [BZ# 753179] -* Mon Oct 31 2011 Clark Williams - 1.0.24-1 -- fixed shell command handling [BZ# 750075] +* Mon Oct 31 2011 Clark Williams - 1.1.17-1 +- fix borken shell argument handling [BZ# 750075] - from Marko Myllynen : - Fix SCM integration on RHEL 5 [BZ# 749518] -- from Ville Skyttä +- from Ville Skyttä : - bash completion fixes -* Fri Oct 14 2011 Clark Williams - 1.0.23-1 +* Wed Oct 21 2011 Clark Williams - 1.1.16-1 - modified bind_mount and tmpfs plugins to use hooks for shell and chroot - refactored --shell and --chroot commands [BZ# 619533,728004,745550] - added input validation for --buildsrpm [BZ# 743173] @@ -239,18 +233,18 @@ From Ville Skyttä : - From Jan Vcelak : - resolve SELinux filesystem mountpoint [BZ# 734781] -* Fri Sep 23 2011 Clark Williams - 1.0.22-1 +* Fri Sep 23 2011 Clark Williams - 1.1.15-1 - Fixed logging issues due to namespace change [BZ# 740232,739550,739972] - Fixed error removing old RMP db files [BZ# 738052] - From Yury V. Zaytsev : - SELinux plugin uses Python 2.5 syntax [BZ# 740327] - Fix inconsistent permissions in specfile [BZ# 715286] -* Fri Sep 9 2011 Clark Williams - 1.0.21-1 +* Fri Sep 9 2011 Clark Williams - 1.1.14-1 - From Toshio Ernie Kuratomi - Fix install path of mockbuild module and default path to module dir -* Thu Sep 8 2011 Clark Williams - 1.0.20-1 +* Thu Sep 8 2011 Clark Williams - 1.1.13-1 - add custom exception for unshare(2) failures - change getLog().warn to getLog().warning for consistency - fix namespace collision with python-mock [BZ# 601725] @@ -261,8 +255,7 @@ From Ville Skyttä : - from Giam Teck Choon - add support for passing options to yum-buildep via mock cfg -* Tue Jul 26 2011 Clark Williams - 1.0.19-1 -- fixed incorrect python version requirement +* Tue Jul 26 2011 Clark Williams - 1.1.12-1 - remove f13 configs - added exception for unshare(2) failures [BZ# 718714] - added back 'newinstance' mount option to devpts (with symlink logic) @@ -270,7 +263,7 @@ From Ville Skyttä : - from Matt Domsch - tmpfs plugin typo fix -* Wed Jun 22 2011 Clark Williams - 1.0.18-1 +* Wed Jun 22 2011 Clark Williams - 1.1.11-1 - remove 'newinstance' mount parameter from devpts filesystem mount (BZ# 711175) - modify --chroot command to print command output - update the python requirement to >= 2.6 for 1.1.x mock branch @@ -281,8 +274,7 @@ From Ville Skyttä : - from Yury V. Zaytsev - Fix inconsistent permissions fixing on /var/cache/mock in SPEC template (BZ 715286) -* Fri May 13 2011 Clark Williams - 1.0.17-1 -- rewrote part of selinux plugin for python 2.4 +* Fri May 13 2011 Clark Williams - 1.1.10-1 - raise exception if running mock and user not member of mock group (BZ# 630791) - call setsid() to kill controlling terminal in chroot (BZ# 672713,501096) - Went back to creating /dev/tty and /dev/ptmx in all chroots (BZ# 683111) @@ -305,26 +297,36 @@ From Ville Skyttä : - From Ville Skyttä : - Fixes shell escaping issue by using tuples rather than strings -* Sat Feb 19 2011 Clark Williams - 1.0.16-1 -- commented out /dev/tty handling code in backend.py (BZ# 609201) +* Fri Feb 18 2011 Clark Williams - 1.1.9-1 - fix createrepo generated root-owned repository data (BZ# 668278) +- commented out /dev/tty handling code in backend.py (BZ# 609201) +- from Ville Skyttä + - Use completion goodies from bash-completion >= 1.2 if available. + - Add --scm-enable and --scm-option to bash completion. + - Delete trailing whitespace. + - Add --install bash completion. + - Make --enable/disable-plugin completion work again. - From Jesse Keating - Make "dist" for rawhide configs be "rawhide" (BZ# 506157) -- From Ville Skyttä - - Make --enable/disable-plugin completion work again. - - Add --install bash completion. - - Delete trailing whitespace. + - Revert "turn off updates-released repository for fedora-14 configs" +- From Mike McLean + - fix typo in el4/5 /dev/tty creation (fh ticket #13, mwhiteley) - From Dennis Gilmore - - add the f15 mock configs - - use the s390 mirrorlists for s390 configs - - add rawhide arm config - -* Thu Jan 6 2011 Clark Williams - 1.0.15-1 + - Revert "disable the updates repos for F-15 they dont yet exist" + - sparc64 boxes can build 32 bit sparc stuff + - add rawhide arm config + - use the s390 mirrorlists for s390 configs + - disable the updates repos for F-15 they dont yet exist + - add the f15 mock configs + +* Fri Dec 17 2010 Clark Williams - 1.1.8-1 - corrected examples section of the mock.1 man page - added logging for 'install' and 'update' commadns (BZ# 594477) - added log file of root cache creation (BZ# 444796) - added logging to the scrub command - added unlockBuildRoot() method to clean up build root lockfile +- added retry logic to mock.util.rmtree +- removed fedora-12 config files - From Michael Hampton : - Add -f (force) option to userdel when recreating mockbuild user (BZ# 662223) - From Marko Myllynen : @@ -333,7 +335,7 @@ From Ville Skyttä : - From Masatake YAMATO : - add runtime location of plugins (BZ# 634224) -* Fri Dec 12 2010 Clark Williams - 1.0.14-1 +* Mon Dec 13 2010 Clark Williams - 1.1.7-1 - add 'legal_host_arches' config option to configs (BZ# 622792) - add root check and group check (BZ# 662223) - from Ville Skyttä : @@ -344,7 +346,7 @@ From Ville Skyttä : - Install build deps with yum-builddep - Add comment why binary packages are built with --nodeps -* Thu Oct 14 2010 Clark Williams - 1.0.13-1 +* Thu Oct 14 2010 Clark Williams - 1.1.6-1 - replace call to perl with native python edit function - change permissions of selinux plugin 'filesystems' file - from Ville Skyttä : @@ -357,56 +359,61 @@ From Ville Skyttä : - Fix buildsrpm() docstring - Error message improvements -* Fri Sep 17 2010 Clark Williams - 1.0.12-1 +* Fri Sep 17 2010 Clark Williams - 1.1.5-1 +- fix typo in exception.py - add cmpKernelEVR function to compare kernel versions (BZ# 526414) +- change selinux plugin to use tempfilej - added commandline argument checking for --buildsrpm (BZ# 605800) - create empty faillog and lastlog in /var/log (BZ# 585973 & 633435) - changed copyin/copyout prints from debug to info - from Alan Franzoni : - reworked the root object _umountall() method - fix epel4 chroot cleanup and umountall issue - -* Sat Aug 14 2010 Clark Williams - 1.0.11-1 -- fix problem with mock.util.rmtree interaction with selinux plugin -- change integer constants to symbolic from errno package -- from Paul Howarth : - - add i586 as a legal target arch - - Retain order of umountCmds - - Exclude bind-mounted cache dirs from root cache - - noarch is always a legal arch - - Update packages after unpacking root cache - -* Tue Aug 3 2010 Clark Williams - 1.0.10-1 -- append rather than insert umount of /proc/filesystems (BZ# 620825) -- set state correctly for SELinux (BZ# 620143) -- turn off updates-released repository for prerelease fedora-14 configs - -* Sat Jul 31 2010 Clark Williams - 1.0.9-1 +- add exception trapping code to _unlock_and_rm_chroot() method + +* Mon Aug 09 2010 Clark Williams - 1.1.4-1 +- pass selinux status to mock.util.rmtree() (BZ# 614440) +- change integer constants to symbolic errno constants in util.py +- from Paul Howarth + - update packages after unpacking root cache (BZ# 557526) + - noarch is always a legal arch (BZ# 622170) + - exclude bind-mounted cache dirs from root cache + - retain order of umount commands (BZ# 620825) + - add i586 as legal build target (BZ# 622544) + +* Tue Aug 03 2010 Clark Williams - 1.1.3-1 +- fix umount ordering problem with selinux plugin (BZ# 620825) +- setup SELinux state properly (BZ# 620143) + +* Fri Jul 30 2010 Clark Williams - 1.1.2-1 - From Jan Vcelak : - - added an selinux plugin + - added selinux plugin - From Kalev Lember : - - patch to tmpfs plugin to allow specifying max fs size + - added max_fs_size parameter for tmpfs plugin - From Ricky Zhou : - allow --sources to specify either single file or directory (BZ# 510409) - From Dennis Gilmore : - - updated epel-6 config files -- From Paul B. Schroeder : + - update the epel-6 mock configs to point at the beta2 mirrorlist urls +- From Paul B. Schroeder : - add the --scrub option for cleaning up cache (BZ# 450726) +- added f14 configs - added symlink from /proc/self/fd to /dev/fd in the chroot (BZ# 526414) -- changed from referencing defaults.cfs to site-defaults.cfg (BZ# 600487) - added i686 architecture -- deleted f10 and f11 configs -- fixed cachefile filtering logic -- moved rpmdb clean block of code to work with --offline option - added logic to detect invalid architecture combinations (BZ# 607144) - added description of how to add user to the mock group (BZ# 570434) +- deleted fedora-10 and fedora-11 configs +- moved rpmdb clean block so that it works with --offline +- changed from referencing defaults.cfs to site-defaults.cfg (BZ# 600487) +- fix cachefile generation filtering logic +- filter out proc,sys,and dev from cache file creation -* Fri Apr 14 2010 Clark Williams - 1.0.8-1 -- rpmdb cache fix from Seth Vidal +* Fri May 14 2010 Clark Williams - 1.1.1-1 +- patch from Seth Vidal to handle + rpmdb cache issue (BZ#591741) -* Thu Mar 11 2010 Jesse Keating - 1.0.7-1 -- Revert new createrepo feature -- Revert -n/-N useradd change, just use -n as it still works +* Thu Mar 11 2010 Jesse Keating - 1.1.0-1 +- Make the createrepo command arguments optional +- Make the createrepo call disabled by default * Fri Feb 19 2010 Clark Williams - 1.0.6-1 - added code to check for SELinux being enabled or disabled diff --git a/sources b/sources index 3c1e34c..dddb970 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c3b36a5493ca24fc3041a0877469939f mock-1.1.28.tar.gz +adc9af053da2a36b8f53af1c84deff97 mock-1.1.28.tar.gz