Compare commits
21 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
42ef2cc506 | ||
|
|
745109712d | ||
|
|
3e1c478b65 | ||
|
|
b036e5ca82 | ||
|
|
2eeaa70f5f | ||
|
|
55739e96b8 | ||
|
|
93ab7205d4 | ||
|
|
09195f20f0 | ||
|
|
ffebcd2974 | ||
|
|
5d67ee57b1 | ||
|
|
9ad869fb98 | ||
|
|
ccece1cac4 | ||
|
|
9215e61c87 | ||
|
|
07bdc3599d | ||
|
|
56b2b1b7ed | ||
|
|
82262b8335 | ||
|
|
dd1d0216d4 | ||
|
|
28575c176a | ||
|
|
ec292b43a6 | ||
|
|
ecc260fbcf | ||
|
|
78598d7236 |
13 changed files with 873 additions and 5274 deletions
0
.cvsignore → .gitignore
vendored
0
.cvsignore → .gitignore
vendored
21
Makefile
21
Makefile
|
|
@ -1,21 +0,0 @@
|
|||
# Makefile for source rpm: yum
|
||||
# $Id: Makefile,v 1.1 2004/09/09 15:13:02 cvsdist Exp $
|
||||
NAME := yum
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attempt a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
||||
19
fix-kernel-updates.patch
Normal file
19
fix-kernel-updates.patch
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
commit 50b01cf6329d00e09a8586527afd9b72466df506
|
||||
Author: Seth Vidal <skvidal@fedoraproject.org>
|
||||
Date: Wed Feb 10 21:50:23 2010 -0500
|
||||
|
||||
fix typo which makes all kernel updates die :(
|
||||
|
||||
diff --git a/yum/__init__.py b/yum/__init__.py
|
||||
index d0bd4cc..df952a8 100644
|
||||
--- a/yum/__init__.py
|
||||
+++ b/yum/__init__.py
|
||||
@@ -4101,7 +4101,7 @@ class YumBase(depsolve.Depsolve):
|
||||
numleft -= 1
|
||||
|
||||
for po,rel in toremove:
|
||||
- txmbr = self.tsInfo.addErase(toremove)
|
||||
+ txmbr = self.tsInfo.addErase(po)
|
||||
# Add a dep relation to the new version of the package, causing this one to be erased
|
||||
# this way skipbroken, should clean out the old one, if the new one is skipped
|
||||
txmbr.depends_on.append(rel)
|
||||
28
reget-metadata-size-fix.patch
Normal file
28
reget-metadata-size-fix.patch
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
commit 2a9161a8b4bfc121fa8245700df355c63b58b442
|
||||
Author: James Antill <james@and.org>
|
||||
Date: Wed Mar 31 00:12:09 2010 -0400
|
||||
|
||||
Should work around the reget MD problems
|
||||
|
||||
diff --git a/yum/yumRepo.py b/yum/yumRepo.py
|
||||
index 8d7617e..b67b897 100644
|
||||
--- a/yum/yumRepo.py
|
||||
+++ b/yum/yumRepo.py
|
||||
@@ -1552,9 +1552,17 @@ class YumRepository(Repository, config.RepoConf):
|
||||
try:
|
||||
checkfunc = (self.checkMD, (mdtype,), {})
|
||||
text = "%s/%s" % (self.id, mdtype)
|
||||
+ if thisdata.size is None:
|
||||
+ reget = None
|
||||
+ else:
|
||||
+ reget = 'simple'
|
||||
+ if os.path.exists(local):
|
||||
+ if os.stat(local).st_size >= int(thisdata.size):
|
||||
+ misc.unlink_f(local)
|
||||
local = self._getFile(relative=remote,
|
||||
local=local,
|
||||
copy_local=1,
|
||||
+ reget=reget,
|
||||
checkfunc=checkfunc,
|
||||
text=text,
|
||||
cache=self.http_caching == 'all',
|
||||
159
revert-yum-dot-import.patch
Normal file
159
revert-yum-dot-import.patch
Normal file
|
|
@ -0,0 +1,159 @@
|
|||
diff --git a/yum/__init__.py b/yum/__init__.py
|
||||
index 6e06005..a5b4922 100644
|
||||
--- a/yum/__init__.py
|
||||
+++ b/yum/__init__.py
|
||||
@@ -32,9 +32,9 @@ import logging.config
|
||||
import operator
|
||||
import gzip
|
||||
|
||||
-import i18n
|
||||
-_ = i18n._
|
||||
-P_ = i18n.P_
|
||||
+import yum.i18n
|
||||
+_ = yum.i18n._
|
||||
+P_ = yum.i18n.P_
|
||||
|
||||
import config
|
||||
from config import ParsingError, ConfigParser
|
||||
@@ -57,15 +57,15 @@ import plugins
|
||||
import logginglevels
|
||||
import yumRepo
|
||||
import callbacks
|
||||
-import history
|
||||
+import yum.history
|
||||
|
||||
import warnings
|
||||
warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning)
|
||||
|
||||
from packages import parsePackages, YumAvailablePackage, YumLocalPackage, YumInstalledPackage, comparePoEVR
|
||||
from constants import *
|
||||
-from rpmtrans import RPMTransaction,SimpleCliCallBack
|
||||
-from i18n import to_unicode, to_str
|
||||
+from yum.rpmtrans import RPMTransaction,SimpleCliCallBack
|
||||
+from yum.i18n import to_unicode, to_str
|
||||
|
||||
import string
|
||||
|
||||
diff --git a/yum/comps.py b/yum/comps.py
|
||||
index d310b1b..2048c77 100755
|
||||
--- a/yum/comps.py
|
||||
+++ b/yum/comps.py
|
||||
@@ -26,7 +26,7 @@ from Errors import CompsException
|
||||
# switch all compsexceptions to grouperrors after api break
|
||||
import fnmatch
|
||||
import re
|
||||
-from i18n import to_unicode
|
||||
+from yum.i18n import to_unicode
|
||||
from misc import get_my_lang_code
|
||||
|
||||
lang_attr = '{http://www.w3.org/XML/1998/namespace}lang'
|
||||
diff --git a/yum/history.py b/yum/history.py
|
||||
index 18d2a41..644c2fc 100644
|
||||
--- a/yum/history.py
|
||||
+++ b/yum/history.py
|
||||
@@ -23,10 +23,11 @@ import glob
|
||||
from weakref import proxy as weakref
|
||||
|
||||
from sqlutils import sqlite, executeSQL
|
||||
-import misc
|
||||
-from constants import *
|
||||
-from packages import YumInstalledPackage, YumAvailablePackage, PackageObject
|
||||
-from i18n import to_unicode
|
||||
+import yum.misc
|
||||
+import yum.constants
|
||||
+from yum.constants import *
|
||||
+from yum.packages import YumInstalledPackage, YumAvailablePackage, PackageObject
|
||||
+from yum.i18n import to_unicode
|
||||
|
||||
_history_dir = '/var/lib/yum/history'
|
||||
|
||||
diff --git a/yum/plugins.py b/yum/plugins.py
|
||||
index c0e510f..02f0d57 100644
|
||||
--- a/yum/plugins.py
|
||||
+++ b/yum/plugins.py
|
||||
@@ -34,7 +34,7 @@ from weakref import proxy as weakref
|
||||
|
||||
from yum import _
|
||||
|
||||
-from i18n import utf8_width
|
||||
+from yum.i18n import utf8_width
|
||||
|
||||
# TODO: expose rpm package sack objects to plugins (once finished)
|
||||
# TODO: allow plugins to use the existing config stuff to define options for
|
||||
diff --git a/yum/rpmsack.py b/yum/rpmsack.py
|
||||
index 74dd69d..fd05f9b 100644
|
||||
--- a/yum/rpmsack.py
|
||||
+++ b/yum/rpmsack.py
|
||||
@@ -31,7 +31,7 @@ from packageSack import PackageSackBase, PackageSackVersion
|
||||
import fnmatch
|
||||
import re
|
||||
|
||||
-from i18n import to_unicode
|
||||
+from yum.i18n import to_unicode
|
||||
import constants
|
||||
|
||||
class RPMInstalledPackage(YumInstalledPackage):
|
||||
diff --git a/yum/rpmtrans.py b/yum/rpmtrans.py
|
||||
index ed52df0..b1b896f 100644
|
||||
--- a/yum/rpmtrans.py
|
||||
+++ b/yum/rpmtrans.py
|
||||
@@ -23,7 +23,7 @@ import time
|
||||
import logging
|
||||
import types
|
||||
import sys
|
||||
-from constants import *
|
||||
+from yum.constants import *
|
||||
from yum import _
|
||||
import misc
|
||||
|
||||
diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
|
||||
index 89744ff..ce2988f 100644
|
||||
--- a/yum/sqlitesack.py
|
||||
+++ b/yum/sqlitesack.py
|
||||
@@ -33,8 +33,8 @@ import rpmUtils.miscutils
|
||||
import sqlutils
|
||||
import constants
|
||||
import operator
|
||||
-from misc import seq_max_split
|
||||
-from i18n import to_utf8, to_unicode
|
||||
+from yum.misc import seq_max_split
|
||||
+from yum.i18n import to_utf8, to_unicode
|
||||
import sys
|
||||
import re
|
||||
|
||||
diff --git a/yum/update_md.py b/yum/update_md.py
|
||||
index 34179ea..b3a120e 100644
|
||||
--- a/yum/update_md.py
|
||||
+++ b/yum/update_md.py
|
||||
@@ -24,10 +24,10 @@ Update metadata (updateinfo.xml) parsing.
|
||||
import sys
|
||||
import gzip
|
||||
|
||||
-from i18n import utf8_text_wrap, to_utf8
|
||||
-from yumRepo import YumRepository
|
||||
-from packages import FakeRepository
|
||||
-from misc import to_xml
|
||||
+from yum.i18n import utf8_text_wrap, to_utf8
|
||||
+from yum.yumRepo import YumRepository
|
||||
+from yum.packages import FakeRepository
|
||||
+from yum.misc import to_xml
|
||||
import Errors
|
||||
|
||||
import rpmUtils.miscutils
|
||||
diff --git a/yum/yumRepo.py b/yum/yumRepo.py
|
||||
index 2bc7476..ea8518a 100644
|
||||
--- a/yum/yumRepo.py
|
||||
+++ b/yum/yumRepo.py
|
||||
@@ -32,9 +32,9 @@ from repos import Repository
|
||||
import parser
|
||||
import sqlitecachec
|
||||
import sqlitesack
|
||||
-import config
|
||||
-import misc
|
||||
-import comps
|
||||
+from yum import config
|
||||
+from yum import misc
|
||||
+from yum import comps
|
||||
from constants import *
|
||||
import metalink
|
||||
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
3ee9e2cf220cd7a557d4193689a76eb2 yum-3.2.24.tar.gz
|
||||
91eff58aa4c25cd4f46b21201bbf9bea yum-3.2.28.tar.gz
|
||||
|
|
|
|||
5588
yum-HEAD.patch
5588
yum-HEAD.patch
File diff suppressed because it is too large
Load diff
39
yum-PK-auto-close-fix.patch
Normal file
39
yum-PK-auto-close-fix.patch
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
commit 3e05536ef876fc761553b632495449fd96bb4b9e
|
||||
Author: James Antill <james@and.org>
|
||||
Date: Tue Sep 14 09:48:23 2010 -0400
|
||||
|
||||
Can't keep ts around, due to rpmdb.auto_close. BZ 622179.
|
||||
This kind of sucks as we have to remember in all future code not to
|
||||
keep a ts over any .rpmdb call, it's even better because almost nobody
|
||||
will hit it. It works though, and is simple.
|
||||
|
||||
We could maybe fix this "better" by using a weakref in rpmdb, and doing
|
||||
it that way. Or having some manual way to mark auto_close as off. Or
|
||||
just rm'ing auto_close as a bad idea.
|
||||
|
||||
diff --git a/yum/__init__.py b/yum/__init__.py
|
||||
index b5e9213..5c689e5 100644
|
||||
--- a/yum/__init__.py
|
||||
+++ b/yum/__init__.py
|
||||
@@ -4301,12 +4301,11 @@ class YumBase(depsolve.Depsolve):
|
||||
keyurls = repo.gpgkey
|
||||
key_installed = False
|
||||
|
||||
- ts = self.rpmdb.readOnlyTS()
|
||||
-
|
||||
for keyurl in keyurls:
|
||||
keys = self._retrievePublicKey(keyurl, repo)
|
||||
|
||||
for info in keys:
|
||||
+ ts = self.rpmdb.readOnlyTS()
|
||||
# Check if key is already installed
|
||||
if misc.keyInstalled(ts, info['keyid'], info['timestamp']) >= 0:
|
||||
self.logger.info(_('GPG key at %s (0x%s) is already installed') % (
|
||||
@@ -4331,6 +4330,7 @@ class YumBase(depsolve.Depsolve):
|
||||
raise Errors.YumBaseError, _("Not installing key")
|
||||
|
||||
# Import the key
|
||||
+ ts = self.rpmdb.readOnlyTS()
|
||||
result = ts.pgpImportPubkey(misc.procgpgkey(info['raw_key']))
|
||||
if result != 0:
|
||||
raise Errors.YumBaseError, \
|
||||
39
yum-do-not-overwrite-keys.patch
Normal file
39
yum-do-not-overwrite-keys.patch
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
commit 11dfde5e065e21c5bdb25a087501b90afe0b0dab
|
||||
Author: Seth Vidal <skvidal@fedoraproject.org>
|
||||
Date: Tue Mar 23 10:09:20 2010 -0400
|
||||
|
||||
make sure we aren't overwriting the value of 'keys'
|
||||
|
||||
this determines how many args we pass back in our yielded results
|
||||
never noticed it b/c nothing in yum uses keys=True - but it broke PK
|
||||
|
||||
diff --git a/yum/__init__.py b/yum/__init__.py
|
||||
index ea73549..0aaa819 100644
|
||||
--- a/yum/__init__.py
|
||||
+++ b/yum/__init__.py
|
||||
@@ -2163,10 +2163,10 @@ class YumBase(depsolve.Depsolve):
|
||||
|
||||
# do the ones we already have
|
||||
for item in sorted_lists.values():
|
||||
- for pkg, keys, values in item:
|
||||
+ for pkg, k, v in item:
|
||||
if pkg not in results_by_pkg:
|
||||
results_by_pkg[pkg] = []
|
||||
- results_by_pkg[pkg].append((keys,values))
|
||||
+ results_by_pkg[pkg].append((k,v))
|
||||
|
||||
# take our existing dict-by-pkg and make the dict-by-count for
|
||||
# this bizarro sorted_lists format
|
||||
@@ -2175,9 +2175,9 @@ class YumBase(depsolve.Depsolve):
|
||||
for pkg in results_by_pkg:
|
||||
totkeys = []
|
||||
totvals = []
|
||||
- for (keys, values) in results_by_pkg[pkg]:
|
||||
- totkeys.extend(keys)
|
||||
- totvals.extend(values)
|
||||
+ for (k, v) in results_by_pkg[pkg]:
|
||||
+ totkeys.extend(k)
|
||||
+ totvals.extend(v)
|
||||
|
||||
totkeys = misc.unique(totkeys)
|
||||
totvals = misc.unique(totvals)
|
||||
67
yum-fix-skip-broken-with-post-depsolve-change.patch
Normal file
67
yum-fix-skip-broken-with-post-depsolve-change.patch
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
commit 359ae828b915101116bb57fbe2645eae056c158b
|
||||
Author: Tim Lauridsen <timlau@fedoraproject.org>
|
||||
Date: Tue Mar 2 16:47:45 2010 +0100
|
||||
|
||||
Make skipbroken run again if packages has been added to transaction by a postresolve plugin
|
||||
|
||||
diff --git a/yum/__init__.py b/yum/__init__.py
|
||||
index f21001d..69af7ba 100644
|
||||
--- a/yum/__init__.py
|
||||
+++ b/yum/__init__.py
|
||||
@@ -866,20 +866,16 @@ class YumBase(depsolve.Depsolve):
|
||||
# works for downloads / mirror failover etc.
|
||||
self.rpmdb.ts = None
|
||||
|
||||
- # if depsolve failed and skipbroken is enabled
|
||||
- # The remove the broken packages from the transactions and
|
||||
- # Try another depsolve
|
||||
- if self.conf.skip_broken and rescode==1:
|
||||
- self.skipped_packages = [] # reset the public list of skipped packages.
|
||||
- sb_st = time.time()
|
||||
- rescode, restring = self._skipPackagesWithProblems(rescode, restring)
|
||||
- self._printTransaction()
|
||||
- self.verbose_logger.debug('Skip-Broken time: %0.3f' % (time.time() - sb_st))
|
||||
+ # do the skip broken magic, if enabled and problems exist
|
||||
+ (rescode, restring) = self._doSkipBroken(rescode, restring)
|
||||
|
||||
self.plugins.run('postresolve', rescode=rescode, restring=restring)
|
||||
|
||||
if self.tsInfo.changed:
|
||||
(rescode, restring) = self.resolveDeps(rescode == 1)
|
||||
+ # If transaction was changed by postresolve plugins then we should run skipbroken again
|
||||
+ (rescode, restring) = self._doSkipBroken(rescode, restring, clear_skipped=False )
|
||||
+
|
||||
if self.tsInfo.pkgSack is not None: # rm Transactions don't have pkgSack
|
||||
self.tsInfo.pkgSack.dropCachedData()
|
||||
self.rpmdb.dropCachedData()
|
||||
@@ -887,6 +883,21 @@ class YumBase(depsolve.Depsolve):
|
||||
self.verbose_logger.debug('Depsolve time: %0.3f' % (time.time() - ds_st))
|
||||
return rescode, restring
|
||||
|
||||
+ def _doSkipBroken(self,rescode, restring, clear_skipped=True):
|
||||
+ ''' do skip broken if it is enabled '''
|
||||
+ # if depsolve failed and skipbroken is enabled
|
||||
+ # The remove the broken packages from the transactions and
|
||||
+ # Try another depsolve
|
||||
+ if self.conf.skip_broken and rescode==1:
|
||||
+ if clear_skipped:
|
||||
+ self.skipped_packages = [] # reset the public list of skipped packages.
|
||||
+ sb_st = time.time()
|
||||
+ rescode, restring = self._skipPackagesWithProblems(rescode, restring)
|
||||
+ self._printTransaction()
|
||||
+ self.verbose_logger.debug('Skip-Broken time: %0.3f' % (time.time() - sb_st))
|
||||
+ return (rescode, restring)
|
||||
+
|
||||
+
|
||||
def _skipPackagesWithProblems(self, rescode, restring):
|
||||
''' Remove the packages with depsolve errors and depsolve again '''
|
||||
|
||||
@@ -983,7 +994,7 @@ class YumBase(depsolve.Depsolve):
|
||||
for po in skipped_list:
|
||||
msg = _(" %s from %s") % (str(po),po.repo.id)
|
||||
self.verbose_logger.info(msg)
|
||||
- self.skipped_packages = skipped_list # make the skipped packages public
|
||||
+ self.skipped_packages.extend(skipped_list) # make the skipped packages public
|
||||
else:
|
||||
# If we cant solve the problems the show the original error messages.
|
||||
self.verbose_logger.info("Skip-broken could not solve problems")
|
||||
|
|
@ -1,20 +1,38 @@
|
|||
diff -urN olddocs/yum.8 docs/yum.8
|
||||
--- olddocs/yum.8 2008-03-17 12:09:29.000000000 -0400
|
||||
+++ docs/yum.8 2008-03-17 12:08:18.000000000 -0400
|
||||
@@ -339,8 +339,8 @@
|
||||
commit 102915d4d402493c48d434ae1d1756225c4468e0
|
||||
Author: James Antill <james@and.org>
|
||||
Date: Mon Jun 14 01:15:21 2010 -0400
|
||||
|
||||
Port manpage files path fixups.
|
||||
|
||||
diff --git a/docs/yum.8 b/docs/yum.8
|
||||
index d5ede0a..3bdb408 100644
|
||||
--- a/docs/yum.8
|
||||
+++ b/docs/yum.8
|
||||
@@ -568,7 +568,7 @@ option in yum.conf. For a plugin to work, the following conditions must be met:
|
||||
1. The plugin module file must be installed in the plugin path as just
|
||||
described.
|
||||
.LP
|
||||
-2. The global \fBplugins\fP option in /etc/yum/yum.conf must be set to `1'.
|
||||
+2. The global \fBplugins\fP option in /etc/yum.conf must be set to `1'.
|
||||
.LP
|
||||
3. A configuration file for the plugin must exist in
|
||||
/etc/yum/pluginconf.d/<plugin_name>.conf and the \fBenabled\fR setting in this
|
||||
@@ -584,9 +584,9 @@ configuration options.
|
||||
.PP
|
||||
.SH "FILES"
|
||||
.nf
|
||||
-/etc/yum/yum.conf
|
||||
-/etc/yum/repos.d/
|
||||
+/etc/yum.conf
|
||||
/etc/yum/version-groups.conf
|
||||
-/etc/yum/repos.d/
|
||||
+/etc/yum.repos.d/
|
||||
/etc/yum/pluginconf.d/
|
||||
/var/cache/yum/
|
||||
.fi
|
||||
|
||||
--- olddocs/yum.conf.5.orig 2009-01-21 13:33:04.000000000 -0500
|
||||
+++ docs/yum.conf.5 2009-01-21 13:34:47.000000000 -0500
|
||||
diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
|
||||
index ca36103..42815b9 100644
|
||||
--- a/docs/yum.conf.5
|
||||
+++ b/docs/yum.conf.5
|
||||
@@ -4,10 +4,10 @@
|
||||
\fByum.conf\fR \- Configuration file for \fByum(8)\fR.
|
||||
.SH "DESCRIPTION"
|
||||
|
|
@ -28,9 +46,9 @@ diff -urN olddocs/yum.8 docs/yum.8
|
|||
See the \fBreposdir\fR option below for further details.
|
||||
|
||||
.SH "PARAMETERS"
|
||||
@@ -38,10 +38,10 @@
|
||||
|
||||
.IP \fBreposdir\fR
|
||||
@@ -42,10 +42,10 @@ of headers and packages after successful installation. Default is '1'
|
||||
.IP
|
||||
\fBreposdir\fR
|
||||
A list of directories where yum should look for .repo files which define
|
||||
-repositories to use. Default is `/etc/yum/repos.d'. Each
|
||||
+repositories to use. Default is `/etc/yum.repos.d'. Each
|
||||
|
|
@ -40,8 +58,8 @@ diff -urN olddocs/yum.8 docs/yum.8
|
|||
+repositories defined in /etc/yum.conf to form the complete set of
|
||||
repositories that yum will use.
|
||||
|
||||
.IP \fBdebuglevel\fR
|
||||
@@ -511,8 +511,8 @@
|
||||
.IP
|
||||
@@ -745,8 +745,8 @@ for any given command. Defaults to False.
|
||||
|
||||
.SH "URL INCLUDE SYNTAX"
|
||||
.LP
|
||||
|
|
@ -52,7 +70,7 @@ diff -urN olddocs/yum.8 docs/yum.8
|
|||
line of the following format:
|
||||
|
||||
include=url://to/some/location
|
||||
@@ -549,8 +549,8 @@
|
||||
@@ -812,8 +812,8 @@ data in any value.
|
||||
|
||||
.SH "FILES"
|
||||
.nf
|
||||
|
|
@ -61,5 +79,5 @@ diff -urN olddocs/yum.8 docs/yum.8
|
|||
+/etc/yum.conf
|
||||
+/etc/yum.repos.d/
|
||||
/etc/yum/pluginconf.d/
|
||||
|
||||
.SH "SEE ALSO"
|
||||
/etc/yum/protected.d
|
||||
/etc/yum/vars
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
--- yum/config.py~ 2008-03-14 15:52:03.000000000 -0400
|
||||
+++ yum/config.py 2008-03-14 15:52:03.000000000 -0400
|
||||
@@ -636,7 +636,7 @@
|
||||
mdpolicy = SelectionOption('group:primary',
|
||||
('instant', 'group:all', 'group:main',
|
||||
'group:small', 'group:primary'))
|
||||
--- yum/config.py~ 2009-10-14 15:52:38.000000000 -0400
|
||||
+++ yum/config.py 2009-10-14 15:59:57.000000000 -0400
|
||||
@@ -670,7 +670,7 @@
|
||||
# similar but better :).
|
||||
mdpolicy = ListOption(['group:primary'])
|
||||
# ('instant', 'group:all', 'group:main', 'group:small', 'group:primary'))
|
||||
- multilib_policy = SelectionOption('all',('best', 'all'))
|
||||
+ multilib_policy = SelectionOption('best',('best', 'all'))
|
||||
# all == install any/all arches you can
|
||||
|
|
|
|||
97
yum.spec
97
yum.spec
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
Summary: RPM installer/updater
|
||||
Name: yum
|
||||
Version: 3.2.24
|
||||
Release: 6%{?dist}
|
||||
Version: 3.2.28
|
||||
Release: 5%{?dist}
|
||||
License: GPLv2+
|
||||
Group: System Environment/Base
|
||||
Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
|
||||
|
|
@ -11,11 +11,13 @@ Source1: yum.conf.fedora
|
|||
Source2: yum-updatesd.conf.fedora
|
||||
Patch0: installonlyn-enable.patch
|
||||
Patch1: yum-mirror-priority.patch
|
||||
Patch2: yum-manpage-files.patch
|
||||
Patch3: yum-multilib-policy-best.patch
|
||||
Patch4: no-more-exactarchlist.patch
|
||||
Patch5: geode-arch.patch
|
||||
Patch6: yum-HEAD.patch
|
||||
Patch7: yum-PK-auto-close-fix.patch
|
||||
|
||||
Patch20: yum-manpage-files.patch
|
||||
|
||||
URL: http://yum.baseurl.org/
|
||||
BuildArch: noarch
|
||||
|
|
@ -29,13 +31,25 @@ Requires: python-sqlite
|
|||
Requires: python-urlgrabber >= 3.9.0-8
|
||||
Requires: yum-metadata-parser >= 1.1.0
|
||||
Requires: pygpgme
|
||||
Obsoletes: yum-skip-broken, yum-basearchonly
|
||||
Obsoletes: yum-skip-broken <= 1.1.18
|
||||
Obsoletes: yum-basearchonly <= 1.1.9
|
||||
Obsoletes: yum-plugin-basearchonly <= 1.1.24
|
||||
Obsoletes: yum-allow-downgrade < 1.1.20-0
|
||||
Obsoletes: yum-plugin-allow-downgrade < 1.1.22-0
|
||||
Obsoletes: yum-plugin-protect-packages < 1.1.27-0
|
||||
Obsoletes: yum-plugin-download-order <= 0.2-2
|
||||
Provides: yum-skip-broken
|
||||
Provides: yum-basearchonly
|
||||
Provides: yum-allow-downgrade
|
||||
Provides: yum-plugin-allow-downgrade
|
||||
Provides: yum-protect-packages
|
||||
Provides: yum-plugin-protect-packages
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
%description
|
||||
Yum is a utility that can check for and automatically download and
|
||||
install updated RPM packages. Dependencies are obtained and downloaded
|
||||
automatically prompting the user as necessary.
|
||||
automatically, prompting the user for permission as necessary.
|
||||
|
||||
%package updatesd
|
||||
Summary: Update notification daemon
|
||||
|
|
@ -55,11 +69,12 @@ can notify you when they are available via email, syslog or dbus.
|
|||
%prep
|
||||
%setup -q
|
||||
%patch1 -p0
|
||||
#%%%patch2 -p0
|
||||
%patch3 -p0
|
||||
%patch4 -p0
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch20 -p1
|
||||
|
||||
%build
|
||||
make
|
||||
|
|
@ -82,6 +97,12 @@ rm -f $RPM_BUILD_ROOT/%{_sbindir}/yum-updatesd
|
|||
rm -f $RPM_BUILD_ROOT/%{_mandir}/man*/yum-updatesd*
|
||||
rm -f $RPM_BUILD_ROOT/%{_datadir}/yum-cli/yumupd.py*
|
||||
|
||||
# Ghost files:
|
||||
mkdir -p $RPM_BUILD_ROOT/var/lib/yum/history
|
||||
mkdir -p $RPM_BUILD_ROOT/var/lib/yum/plugins
|
||||
mkdir -p $RPM_BUILD_ROOT/var/lib/yum/yumdb
|
||||
touch $RPM_BUILD_ROOT/var/lib/yum/uuid
|
||||
|
||||
%find_lang %name
|
||||
|
||||
%clean
|
||||
|
|
@ -92,8 +113,12 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%doc README AUTHORS COPYING TODO INSTALL ChangeLog
|
||||
%config(noreplace) %{_sysconfdir}/yum.conf
|
||||
%dir %{_sysconfdir}/yum
|
||||
%config(noreplace) %{_sysconfdir}/yum/version-groups.conf
|
||||
%dir %{_sysconfdir}/yum/protected.d
|
||||
%dir %{_sysconfdir}/yum.repos.d
|
||||
%dir %{_sysconfdir}/yum/vars
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/yum
|
||||
%{_sysconfdir}/bash_completion.d
|
||||
%dir %{_datadir}/yum-cli
|
||||
%{_datadir}/yum-cli/*
|
||||
%{_bindir}/yum
|
||||
|
|
@ -101,6 +126,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%{python_sitelib}/rpmUtils
|
||||
%dir /var/cache/yum
|
||||
%dir /var/lib/yum
|
||||
%ghost /var/lib/yum/uuid
|
||||
%ghost /var/lib/yum/history
|
||||
%ghost /var/lib/yum/plugins
|
||||
%ghost /var/lib/yum/yumdb
|
||||
%{_mandir}/man*/yum.*
|
||||
%{_mandir}/man*/yum-shell*
|
||||
# plugin stuff
|
||||
|
|
@ -108,6 +137,62 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%dir /usr/lib/yum-plugins
|
||||
|
||||
%changelog
|
||||
* Tue Sep 14 2010 James Antill <james at fedoraproject.org> - 3.2.28-4
|
||||
- Fix auto-close bug with GPG key installs.
|
||||
- Resolves: bug#622179
|
||||
- Fix obsoletes on basearchonly.
|
||||
- Resolves: bug#629138
|
||||
|
||||
* Fri Aug 27 2010 Seth Vidal <skvidal at fedoraproject.org>
|
||||
- obsoleted yum-plugin-download-order
|
||||
|
||||
* Thu Aug 12 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.28-3
|
||||
- latest head
|
||||
- fix gpg key import
|
||||
- more unicode fixes
|
||||
- output slightly more clear depsovling error msgs
|
||||
- sync up spec file with f13,f14
|
||||
|
||||
* Mon Aug 9 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.28-2
|
||||
- fixes sqlite historydb conversion bug
|
||||
- patches up some unicide issues
|
||||
|
||||
|
||||
* Fri Jul 30 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.28-1
|
||||
- 3.2.28
|
||||
|
||||
* Thu Apr 8 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.27-3
|
||||
- fix regets on metadata when we run into an old file that's larger
|
||||
than the new one
|
||||
|
||||
* Tue Mar 23 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.27-2
|
||||
- broke searching in PK, this patch fixes it.
|
||||
|
||||
* Thu Mar 18 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.27-1
|
||||
- update to 3.2.27 - lots of fixes since 3.2.26
|
||||
|
||||
* Thu Mar 4 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.26-3
|
||||
- up to head-as-f13-has and include the skip-broken fix
|
||||
|
||||
|
||||
* Wed Feb 10 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.26-2
|
||||
- grumble.
|
||||
|
||||
* Tue Feb 9 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.26-1
|
||||
- final 3.2.26
|
||||
|
||||
* Wed Oct 14 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.25-1
|
||||
- 3.2.25
|
||||
|
||||
* Wed Sep 30 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.24-9
|
||||
- revert yum. import patch b/c it breaks a bunch of things
|
||||
|
||||
* Wed Sep 30 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.24-8
|
||||
- fix up broken build b/c of version-groups.conf file
|
||||
|
||||
* Tue Sep 29 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.24-7
|
||||
- fixes for odd outputs from ts.run and logs for what we store in history
|
||||
|
||||
* Wed Sep 23 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.24-6
|
||||
- new head patch - fixes some issues with history and chroots
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue