[73822] trunk/dports/sysutils/yum
afb at macports.org
afb at macports.org
Fri Nov 26 03:05:58 PST 2010
Revision: 73822
http://trac.macports.org/changeset/73822
Author: afb at macports.org
Date: 2010-11-26 03:05:54 -0800 (Fri, 26 Nov 2010)
Log Message:
-----------
port upgrade: yum 3.2.28
Modified Paths:
--------------
trunk/dports/sysutils/yum/Portfile
trunk/dports/sysutils/yum/files/patch-packages.py
trunk/dports/sysutils/yum/files/patch-prefix.diff
Modified: trunk/dports/sysutils/yum/Portfile
===================================================================
--- trunk/dports/sysutils/yum/Portfile 2010-11-26 09:54:40 UTC (rev 73821)
+++ trunk/dports/sysutils/yum/Portfile 2010-11-26 11:05:54 UTC (rev 73822)
@@ -3,7 +3,7 @@
PortSystem 1.0
name yum
-version 3.2.21
+version 3.2.28
platforms darwin
categories sysutils archivers
maintainers mac.com:n3npq afb
@@ -16,9 +16,9 @@
homepage http://yum.baseurl.org/
master_sites ${homepage}download/3.2/
-checksums md5 2c9ff2e3c329e5cd0ce335d05bf96b7b \
- sha1 d9cc6cc6861bb445b81cd0946771e8510280b7e5 \
- rmd160 8c5f8be6cc60336814d3fe539d87a001a53e0f25
+checksums md5 91eff58aa4c25cd4f46b21201bbf9bea \
+ sha1 2f13dbb8a78a510f9f5a5e9657592f74bafb789a \
+ rmd160 954ce320cf0168f361bd5c163154a2a6281c3572
patchfiles patch-prefix.diff patch-sqlutils.py patch-packages.py
Modified: trunk/dports/sysutils/yum/files/patch-packages.py
===================================================================
--- trunk/dports/sysutils/yum/files/patch-packages.py 2010-11-26 09:54:40 UTC (rev 73821)
+++ trunk/dports/sysutils/yum/files/patch-packages.py 2010-11-26 11:05:54 UTC (rev 73822)
@@ -1,11 +1,20 @@
---- yum/packages.py.orig 2008-11-06 11:57:14.000000000 +0100
-+++ yum/packages.py 2008-11-06 12:09:20.000000000 +0100
-@@ -1121,6 +1121,8 @@ class YumHeaderPackage(YumAvailablePacka
+--- yum/packages.py.orig 2010-07-09 19:28:16.000000000 +0200
++++ yum/packages.py 2010-08-03 16:43:16.000000000 +0100
+@@ -1353,11 +1353,14 @@
+ is a pre-requires or a not"""
+ # FIXME this should probably be put in rpmUtils.miscutils since
# - that's what it is
- newflag = flag
++ RPMSENSE_PREREQ = (1 << 6)
++ RPMSENSE_SCRIPT_PRE = (1 << 9)
++ RPMSENSE_SCRIPT_POST = (1 << 10)
if flag is not None:
-+ if not hasattr(rpm, 'RPMSENSE_PREREQ'):
-+ return 0
- newflag = flag & rpm.RPMSENSE_PREREQ
- if newflag == rpm.RPMSENSE_PREREQ:
+ # Note: RPMSENSE_PREREQ == 0 since rpm-4.4'ish
+- if flag & (rpm.RPMSENSE_PREREQ |
+- rpm.RPMSENSE_SCRIPT_PRE |
+- rpm.RPMSENSE_SCRIPT_POST):
++ if flag & (RPMSENSE_PREREQ |
++ RPMSENSE_SCRIPT_PRE |
++ RPMSENSE_SCRIPT_POST):
return 1
+ return 0
+
Modified: trunk/dports/sysutils/yum/files/patch-prefix.diff
===================================================================
--- trunk/dports/sysutils/yum/files/patch-prefix.diff 2010-11-26 09:54:40 UTC (rev 73821)
+++ trunk/dports/sysutils/yum/files/patch-prefix.diff 2010-11-26 11:05:54 UTC (rev 73822)
@@ -49,7 +49,7 @@
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
-@@ -1207,10 +1207,10 @@
+@@ -1412,10 +1412,10 @@
if opts.installroot:
if os.access(opts.installroot+'/'+opts.conffile, os.R_OK):
opts.conffile = opts.installroot+'/'+opts.conffile
@@ -64,28 +64,30 @@
root=opts.installroot
else:
root = '/'
-@@ -1103,7 +1103,7 @@
- help=_("be tolerant of errors"))
- self.add_option("-C", dest="cacheonly", action="store_true",
- help=_("run entirely from cache, don't update cache"))
-- self.add_option("-c", dest="conffile", default='/etc/yum/yum.conf',
-+ self.add_option("-c", dest="conffile", default='@@PREFIX@@/etc/yum/yum.conf',
- help=_("config file location"), metavar=' [config file]')
- self.add_option("-R", dest="sleeptime", type='int', default=None,
- help=_("maximum command wait time"), metavar=' [minutes]')
+@@ -1456,7 +1456,7 @@
+ action="store_true",
+ help=_("run entirely from system cache, don't update cache"))
+ group.add_option("-c", "--config", dest="conffile",
+- default='/etc/yum/yum.conf',
++ default='@@PREFIX@@/etc/yum/yum.conf',
+ help=_("config file location"), metavar='[config file]')
+ group.add_option("-R", "--randomwait", dest="sleeptime", type='int',
+ default=None,
--- ./docs/Makefile.orig 2006-11-14 07:15:47.000000000 +0100
+++ ./docs/Makefile 2007-06-20 16:26:25.000000000 +0200
-@@ -6,9 +6,9 @@
+@@ -6,10 +6,10 @@
rm -fr epydoc
install:
-- mkdir -p $(DESTDIR)/usr/share/man/man{5,8}
+- mkdir -p $(DESTDIR)/usr/share/man/man5
+- mkdir -p $(DESTDIR)/usr/share/man/man8
- install -m 644 yum.8 $(DESTDIR)/usr/share/man/man8/yum.8
- install -m 644 yum-shell.8 $(DESTDIR)/usr/share/man/man8/yum-shell.8
- install -m 644 yum.conf.5 $(DESTDIR)/usr/share/man/man5/yum.conf.5
- install -m 644 yum-updatesd.8 $(DESTDIR)/usr/share/man/man8/yum-updatesd.8
- install -m 644 yum-updatesd.conf.5 $(DESTDIR)/usr/share/man/man5/yum-updatesd.conf.5
-+ mkdir -p $(DESTDIR)@@PREFIX@@/share/man/man{5,8}
++ mkdir -p $(DESTDIR)@@PREFIX@@/share/man/man5
++ mkdir -p $(DESTDIR)@@PREFIX@@/share/man/man8
+ install -m 644 yum.8 $(DESTDIR)@@PREFIX@@/share/man/man8/yum.8
+ install -m 644 yum-shell.8 $(DESTDIR)@@PREFIX@@/share/man/man8/yum-shell.8
+ install -m 644 yum.conf.5 $(DESTDIR)@@PREFIX@@/share/man/man5/yum.conf.5
@@ -93,18 +95,29 @@
+ install -m 644 yum-updatesd.conf.5 $(DESTDIR)@@PREFIX@@/share/man/man5/yum-updatesd.conf.5
--- ./etc/Makefile.orig 2007-01-29 17:14:59.000000000 +0100
+++ ./etc/Makefile 2007-06-20 16:26:25.000000000 +0200
-@@ -5,20 +5,20 @@
+@@ -1,4 +1,4 @@
+-YUMETC=$(DESTDIR)/etc/yum
++YUMETC=$(DESTDIR)@@PREFIX@@/etc/yum
+
+ all:
+ echo "Nothing to do"
+@@ -7,25 +7,25 @@
rm -f *.pyc *.pyo *~
install:
- mkdir -p $(DESTDIR)/etc/yum/
+- mkdir -p $(DESTDIR)/etc/yum/protected.d
- mkdir -p $(DESTDIR)/etc/yum/repos.d
+- mkdir -p $(DESTDIR)/etc/yum/vars
+ mkdir -p $(DESTDIR)@@PREFIX@@/etc/yum/
++ mkdir -p $(DESTDIR)@@PREFIX@@/etc/yum/protected.d
+ mkdir -p $(DESTDIR)@@PREFIX@@/etc/yum/repos.d
++ mkdir -p $(DESTDIR)@@PREFIX@@/etc/yum/vars
-- install -m 644 yum.conf $(DESTDIR)/etc/yum/yum.conf
-+ install -m 644 yum.conf $(DESTDIR)@@PREFIX@@/etc/yum/yum.conf
+ install -m 644 yum.conf $(YUMETC)/yum.conf
+ install -m 644 version-groups.conf $(YUMETC)/version-groups.conf
+
- mkdir -p $(DESTDIR)/etc/logrotate.d
- install -m 644 yum.logrotate $(DESTDIR)/etc/logrotate.d/yum
+ mkdir -p $(DESTDIR)@@PREFIX@@/etc/logrotate.d
@@ -123,7 +136,10 @@
- install -m 755 yum-updatesd.conf $(DESTDIR)/etc/yum/yum-updatesd.conf
+ install -m 755 yum-updatesd.conf $(DESTDIR)@@PREFIX@@/etc/yum/yum-updatesd.conf
-
+- mkdir -p $(DESTDIR)/etc/bash_completion.d
+- install -m 644 yum.bash $(DESTDIR)/etc/bash_completion.d
++ mkdir -p $(DESTDIR)@@PREFIX@@/etc/bash_completion.d
++ install -m 644 yum.bash $(DESTDIR)@@PREFIX@@/etc/bash_completion.d
--- ./etc/yum.console.orig 2004-08-31 05:35:46.000000000 +0200
+++ ./etc/yum.console 2007-06-20 16:43:35.000000000 +0200
@@ -1,4 +1,4 @@
@@ -150,7 +166,7 @@
# the Free Software Foundation; either version 2 of the License, or
--- Makefile.orig 2007-08-22 06:10:48.000000000 +0200
+++ Makefile 2007-08-28 16:58:56.000000000 +0200
-@@ -17,19 +17,19 @@
+@@ -22,19 +22,19 @@
for d in $(SUBDIRS); do make PYTHON=$(PYTHON) -C $$d; [ $$? = 0 ] || exit 1 ; done
install:
@@ -173,9 +189,9 @@
+ install -m 755 bin/yum-updatesd.py $(DESTDIR)@@PREFIX@@/sbin/yum-updatesd
- mkdir -p $(DESTDIR)/var/cache/yum
-- mkdir -p $(DESTDIR)/var/lib/yum
+- mkdir -p $(DESTDIR)/var/lib/yum
+ mkdir -p $(DESTDIR)@@PREFIX@@/var/cache/yum
-+ mkdir -p $(DESTDIR)@@PREFIX@@/var/lib/yum
++ mkdir -p $(DESTDIR)@@PREFIX@@/var/lib/yum
for d in $(SUBDIRS); do make PYTHON=$(PYTHON) DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done
@@ -251,8 +267,8 @@
-#!/usr/bin/python -tt
+#!@@PYTHON@@ -tt
- import exceptions
+ class RpmUtilsError(Exception):
--- ./rpmUtils/arch.py.orig 2007-04-27 14:58:04.000000000 +0200
+++ ./rpmUtils/arch.py 2007-06-20 16:30:29.000000000 +0200
@@ -1,4 +1,4 @@
@@ -322,24 +338,24 @@
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
-@@ -98,7 +98,7 @@
- self._getConfig(init_plugins=False)
+@@ -92,7 +92,7 @@
+ you tweak it here, and when yb.conf does it's thing ... it happens. """
+
+ def __init__(self):
+- self.fn = '/etc/yum/yum.conf'
++ self.fn = '@@PREFIX@@/etc/yum/yum.conf'
+ self.root = '/'
+ self.init_plugins = True
+ self.plugin_types = (plugins.TYPE_CORE,)
+@@ -208,7 +208,7 @@
+ self.preconf.init_plugins = False
self.conf.cache = cache
- def doConfigSetup(self, fn='/etc/yum/yum.conf', root='/', init_plugins=True,
+ def doConfigSetup(self, fn='@@PREFIX@@/etc/yum/yum.conf', root='/', init_plugins=True,
plugin_types=(plugins.TYPE_CORE,), optparser=None, debuglevel=None,
errorlevel=None):
- warnings.warn('doConfigSetup() will go away in a future version of Yum.\n',
-@@ -108,7 +108,7 @@
- plugin_types=plugin_types, optparser=optparser, debuglevel=debuglevel,
- errorlevel=errorlevel)
-
-- def _getConfig(self, fn='/etc/yum/yum.conf', root='/', init_plugins=True,
-+ def _getConfig(self, fn='@@PREFIX@@/etc/yum/yum.conf', root='/', init_plugins=True,
- plugin_types=(plugins.TYPE_CORE,), optparser=None, debuglevel=None,
- errorlevel=None,disabled_plugins=None):
- '''
+ warnings.warn(_('doConfigSetup() will go away in a future version of Yum.\n'),
--- ./utils.py.orig 2007-04-23 18:44:43.000000000 +0200
+++ ./utils.py 2007-06-19 18:17:13.000000000 +0200
@@ -1,4 +1,4 @@
@@ -356,7 +372,7 @@
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-@@ -582,10 +582,10 @@
+@@ -614,15 +614,15 @@
distroverpkg = Option('redhat-release')
installroot = Option('/')
@@ -369,15 +385,20 @@
+ pluginconfpath = ListOption(['@@PREFIX@@/etc/yum/pluginconf.d'])
gaftonmode = BoolOption(False)
syslog_ident = Option()
- syslog_facility = Option('LOG_DAEMON')
-@@ -599,11 +599,11 @@
+ syslog_facility = Option('LOG_USER')
+ syslog_device = Option('/dev/log')
+- persistdir = Option('/var/lib/yum')
++ persistdir = Option('@@PREFIX@@/var/lib/yum')
+
+ class YumConf(StartupConf):
+ '''
+@@ -633,11 +633,11 @@
retries = PositiveIntOption(10, names_of_0=["<forever>"])
recent = IntOption(7, range_min=0)
- cachedir = Option('/var/cache/yum')
-- persistdir = Option('/var/lib/yum')
+ cachedir = Option('@@PREFIX@@/var/cache/yum')
-+ persistdir = Option('@@PREFIX@@/var/lib/yum')
+
keepcache = BoolOption(True)
- logfile = Option('/var/log/yum.log')
- reposdir = ListOption(['/etc/yum/repos.d', '/etc/yum.repos.d'])
@@ -388,9 +409,9 @@
exclude = ListOption()
--- ./yum/constants.py.orig 2007-04-11 07:20:00.000000000 +0200
+++ ./yum/constants.py 2007-06-20 16:34:44.000000000 +0200
-@@ -14,7 +14,7 @@
+@@ -17,7 +17,7 @@
+ """
-
#Constants
-YUM_PID_FILE = '/var/run/yum.pid'
+YUM_PID_FILE = '@@PREFIX@@/var/run/yum.pid'
@@ -540,3 +561,19 @@
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
+--- yum/history.py.orig 2010-06-29 21:56:57.000000000 +0200
++++ yum/history.py 2010-11-26 12:04:04.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python -t
++#!@@PYTHON@@ -t
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+--- yum/pkgtag_db.py.orig 2010-05-06 16:54:46.000000000 +0200
++++ yum/pkgtag_db.py 2010-11-26 12:03:59.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python -tt
++#!@@PYTHON@@ -tt
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101126/277cbe15/attachment-0001.html>
More information about the macports-changes
mailing list