Ignore:
Timestamp:
Nov 26, 2010, 11:05:54 AM (9 years ago)
Author:
afb@…
Message:

port upgrade: yum 3.2.28

Location:
trunk/dports/sysutils/yum
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/sysutils/yum/Portfile

    r57375 r73822  
    44
    55name            yum
    6 version         3.2.21
     6version         3.2.28
    77platforms       darwin
    88categories      sysutils archivers
     
    1717homepage        http://yum.baseurl.org/
    1818master_sites    ${homepage}download/3.2/
    19 checksums       md5 2c9ff2e3c329e5cd0ce335d05bf96b7b \
    20                 sha1 d9cc6cc6861bb445b81cd0946771e8510280b7e5 \
    21                 rmd160 8c5f8be6cc60336814d3fe539d87a001a53e0f25
     19checksums       md5 91eff58aa4c25cd4f46b21201bbf9bea \
     20                sha1 2f13dbb8a78a510f9f5a5e9657592f74bafb789a \
     21                rmd160 954ce320cf0168f361bd5c163154a2a6281c3572
    2222
    2323patchfiles      patch-prefix.diff patch-sqlutils.py patch-packages.py
  • trunk/dports/sysutils/yum/files/patch-packages.py

    r41577 r73822  
    1 --- yum/packages.py.orig        2008-11-06 11:57:14.000000000 +0100
    2 +++ yum/packages.py     2008-11-06 12:09:20.000000000 +0100
    3 @@ -1121,6 +1121,8 @@ class YumHeaderPackage(YumAvailablePacka
     1--- yum/packages.py.orig        2010-07-09 19:28:16.000000000 +0200
     2+++ yum/packages.py     2010-08-03 16:43:16.000000000 +0100
     3@@ -1353,11 +1353,14 @@
     4            is a pre-requires or a not"""
     5         # FIXME this should probably be put in rpmUtils.miscutils since
    46         # - that's what it is
    5          newflag = flag
     7+        RPMSENSE_PREREQ = (1 << 6)
     8+        RPMSENSE_SCRIPT_PRE = (1 << 9)
     9+        RPMSENSE_SCRIPT_POST = (1 << 10)
    610         if flag is not None:
    7 +            if not hasattr(rpm, 'RPMSENSE_PREREQ'):
    8 +                return 0
    9              newflag = flag & rpm.RPMSENSE_PREREQ
    10              if newflag == rpm.RPMSENSE_PREREQ:
     11             # Note: RPMSENSE_PREREQ == 0 since rpm-4.4'ish
     12-            if flag & (rpm.RPMSENSE_PREREQ |
     13-                       rpm.RPMSENSE_SCRIPT_PRE |
     14-                       rpm.RPMSENSE_SCRIPT_POST):
     15+            if flag & (RPMSENSE_PREREQ |
     16+                       RPMSENSE_SCRIPT_PRE |
     17+                       RPMSENSE_SCRIPT_POST):
    1118                 return 1
     19         return 0
     20 
  • trunk/dports/sysutils/yum/files/patch-prefix.diff

    r41566 r73822  
    5050 # it under the terms of the GNU General Public License as published by
    5151 # the Free Software Foundation; either version 2 of the License, or
    52 @@ -1207,10 +1207,10 @@
     52@@ -1412,10 +1412,10 @@
    5353         if opts.installroot:
    5454             if os.access(opts.installroot+'/'+opts.conffile, os.R_OK):
     
    6565         else:
    6666             root = '/'
    67 @@ -1103,7 +1103,7 @@
    68                  help=_("be tolerant of errors"))
    69          self.add_option("-C", dest="cacheonly", action="store_true",
    70                  help=_("run entirely from cache, don't update cache"))
    71 -        self.add_option("-c", dest="conffile", default='/etc/yum/yum.conf',
    72 +        self.add_option("-c", dest="conffile", default='@@PREFIX@@/etc/yum/yum.conf',
    73                  help=_("config file location"), metavar=' [config file]')
    74          self.add_option("-R", dest="sleeptime", type='int', default=None,
    75                  help=_("maximum command wait time"), metavar=' [minutes]')
     67@@ -1456,7 +1456,7 @@
     68                 action="store_true",
     69                 help=_("run entirely from system cache, don't update cache"))
     70         group.add_option("-c", "--config", dest="conffile",
     71-                default='/etc/yum/yum.conf',
     72+                default='@@PREFIX@@/etc/yum/yum.conf',
     73                 help=_("config file location"), metavar='[config file]')
     74         group.add_option("-R", "--randomwait", dest="sleeptime", type='int',
     75                 default=None,
    7676--- ./docs/Makefile.orig        2006-11-14 07:15:47.000000000 +0100
    7777+++ ./docs/Makefile     2007-06-20 16:26:25.000000000 +0200
    78 @@ -6,9 +6,9 @@
     78@@ -6,10 +6,10 @@
    7979        rm -fr epydoc
    8080 
    8181 install:
    82 -       mkdir -p $(DESTDIR)/usr/share/man/man{5,8}
     82-       mkdir -p $(DESTDIR)/usr/share/man/man5
     83-       mkdir -p $(DESTDIR)/usr/share/man/man8
    8384-       install -m 644 yum.8 $(DESTDIR)/usr/share/man/man8/yum.8
    8485-       install -m 644 yum-shell.8 $(DESTDIR)/usr/share/man/man8/yum-shell.8
     
    8687-       install -m 644 yum-updatesd.8 $(DESTDIR)/usr/share/man/man8/yum-updatesd.8
    8788-       install -m 644 yum-updatesd.conf.5 $(DESTDIR)/usr/share/man/man5/yum-updatesd.conf.5
    88 +       mkdir -p $(DESTDIR)@@PREFIX@@/share/man/man{5,8}
     89+       mkdir -p $(DESTDIR)@@PREFIX@@/share/man/man5
     90+       mkdir -p $(DESTDIR)@@PREFIX@@/share/man/man8
    8991+       install -m 644 yum.8 $(DESTDIR)@@PREFIX@@/share/man/man8/yum.8
    9092+       install -m 644 yum-shell.8 $(DESTDIR)@@PREFIX@@/share/man/man8/yum-shell.8
     
    9496--- ./etc/Makefile.orig 2007-01-29 17:14:59.000000000 +0100
    9597+++ ./etc/Makefile      2007-06-20 16:26:25.000000000 +0200
    96 @@ -5,20 +5,20 @@
     98@@ -1,4 +1,4 @@
     99-YUMETC=$(DESTDIR)/etc/yum
     100+YUMETC=$(DESTDIR)@@PREFIX@@/etc/yum
     101 
     102 all:
     103        echo "Nothing to do"
     104@@ -7,25 +7,25 @@
    97105        rm -f *.pyc *.pyo *~
    98106 
    99107 install:
    100108-       mkdir -p $(DESTDIR)/etc/yum/
     109-       mkdir -p $(DESTDIR)/etc/yum/protected.d
    101110-       mkdir -p $(DESTDIR)/etc/yum/repos.d
     111-       mkdir -p $(DESTDIR)/etc/yum/vars
    102112+       mkdir -p $(DESTDIR)@@PREFIX@@/etc/yum/
     113+       mkdir -p $(DESTDIR)@@PREFIX@@/etc/yum/protected.d
    103114+       mkdir -p $(DESTDIR)@@PREFIX@@/etc/yum/repos.d
    104  
    105 -       install -m 644 yum.conf $(DESTDIR)/etc/yum/yum.conf
    106 +       install -m 644 yum.conf $(DESTDIR)@@PREFIX@@/etc/yum/yum.conf
     115+       mkdir -p $(DESTDIR)@@PREFIX@@/etc/yum/vars
     116 
     117        install -m 644 yum.conf $(YUMETC)/yum.conf
     118 
     119        install -m 644 version-groups.conf $(YUMETC)/version-groups.conf
    107120 
    108121-       mkdir -p $(DESTDIR)/etc/logrotate.d
     
    124137+       install -m 755 yum-updatesd.conf $(DESTDIR)@@PREFIX@@/etc/yum/yum-updatesd.conf
    125138 
    126  
     139-       mkdir -p $(DESTDIR)/etc/bash_completion.d
     140-       install -m 644 yum.bash $(DESTDIR)/etc/bash_completion.d
     141+       mkdir -p $(DESTDIR)@@PREFIX@@/etc/bash_completion.d
     142+       install -m 644 yum.bash $(DESTDIR)@@PREFIX@@/etc/bash_completion.d
    127143--- ./etc/yum.console.orig      2004-08-31 05:35:46.000000000 +0200
    128144+++ ./etc/yum.console   2007-06-20 16:43:35.000000000 +0200
     
    151167--- Makefile.orig       2007-08-22 06:10:48.000000000 +0200
    152168+++ Makefile    2007-08-28 16:58:56.000000000 +0200
    153 @@ -17,19 +17,19 @@
     169@@ -22,19 +22,19 @@
    154170        for d in $(SUBDIRS); do make PYTHON=$(PYTHON) -C $$d; [ $$? = 0 ] || exit 1 ; done
    155171 
     
    174190 
    175191-       mkdir -p $(DESTDIR)/var/cache/yum
    176 -       mkdir -p $(DESTDIR)/var/lib/yum 
     192-       mkdir -p $(DESTDIR)/var/lib/yum
    177193+       mkdir -p $(DESTDIR)@@PREFIX@@/var/cache/yum
    178 +       mkdir -p $(DESTDIR)@@PREFIX@@/var/lib/yum       
     194+       mkdir -p $(DESTDIR)@@PREFIX@@/var/lib/yum
    179195 
    180196        for d in $(SUBDIRS); do make PYTHON=$(PYTHON) DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done
     
    252268+#!@@PYTHON@@ -tt
    253269 
    254  import exceptions
    255  
     270 
     271 class RpmUtilsError(Exception):
    256272--- ./rpmUtils/arch.py.orig     2007-04-27 14:58:04.000000000 +0200
    257273+++ ./rpmUtils/arch.py  2007-06-20 16:30:29.000000000 +0200
     
    323339 # it under the terms of the GNU General Public License as published by
    324340 # the Free Software Foundation; either version 2 of the License, or
    325 @@ -98,7 +98,7 @@
    326          self._getConfig(init_plugins=False)
     341@@ -92,7 +92,7 @@
     342        you tweak it here, and when yb.conf does it's thing ... it happens. """
     343 
     344     def __init__(self):
     345-        self.fn = '/etc/yum/yum.conf'
     346+        self.fn = '@@PREFIX@@/etc/yum/yum.conf'
     347         self.root = '/'
     348         self.init_plugins = True
     349         self.plugin_types = (plugins.TYPE_CORE,)
     350@@ -208,7 +208,7 @@
     351         self.preconf.init_plugins = False
    327352         self.conf.cache = cache
    328353 
     
    331356             plugin_types=(plugins.TYPE_CORE,), optparser=None, debuglevel=None,
    332357             errorlevel=None):
    333          warnings.warn('doConfigSetup() will go away in a future version of Yum.\n',
    334 @@ -108,7 +108,7 @@
    335               plugin_types=plugin_types, optparser=optparser, debuglevel=debuglevel,
    336               errorlevel=errorlevel)
    337          
    338 -    def _getConfig(self, fn='/etc/yum/yum.conf', root='/', init_plugins=True,
    339 +    def _getConfig(self, fn='@@PREFIX@@/etc/yum/yum.conf', root='/', init_plugins=True,
    340              plugin_types=(plugins.TYPE_CORE,), optparser=None, debuglevel=None,
    341              errorlevel=None,disabled_plugins=None):
    342          '''
     358         warnings.warn(_('doConfigSetup() will go away in a future version of Yum.\n'),
    343359--- ./utils.py.orig     2007-04-23 18:44:43.000000000 +0200
    344360+++ ./utils.py  2007-06-19 18:17:13.000000000 +0200
     
    357373 # This program is free software; you can redistribute it and/or modify
    358374 # it under the terms of the GNU General Public License as published by
    359 @@ -582,10 +582,10 @@
     375@@ -614,15 +614,15 @@
    360376 
    361377     distroverpkg = Option('redhat-release')
     
    370386     gaftonmode = BoolOption(False)
    371387     syslog_ident = Option()
    372      syslog_facility = Option('LOG_DAEMON')
    373 @@ -599,11 +599,11 @@
     388     syslog_facility = Option('LOG_USER')
     389     syslog_device = Option('/dev/log')
     390-    persistdir = Option('/var/lib/yum')
     391+    persistdir = Option('@@PREFIX@@/var/lib/yum')
     392     
     393 class YumConf(StartupConf):
     394     '''
     395@@ -633,11 +633,11 @@
    374396     retries = PositiveIntOption(10, names_of_0=["<forever>"])
    375397     recent = IntOption(7, range_min=0)
    376398 
    377399-    cachedir = Option('/var/cache/yum')
    378 -    persistdir = Option('/var/lib/yum')
    379400+    cachedir = Option('@@PREFIX@@/var/cache/yum')
    380 +    persistdir = Option('@@PREFIX@@/var/lib/yum')
     401 
    381402     keepcache = BoolOption(True)
    382403-    logfile = Option('/var/log/yum.log')
     
    389410--- ./yum/constants.py.orig     2007-04-11 07:20:00.000000000 +0200
    390411+++ ./yum/constants.py  2007-06-20 16:34:44.000000000 +0200
    391 @@ -14,7 +14,7 @@
    392  
     412@@ -17,7 +17,7 @@
     413 """
    393414 
    394415 #Constants
     
    541562 # it under the terms of the GNU General Public License as published by
    542563 # the Free Software Foundation; either version 2 of the License, or
     564--- yum/history.py.orig 2010-06-29 21:56:57.000000000 +0200
     565+++ yum/history.py      2010-11-26 12:04:04.000000000 +0100
     566@@ -1,4 +1,4 @@
     567-#!/usr/bin/python -t
     568+#!@@PYTHON@@ -t
     569 # This program is free software; you can redistribute it and/or modify
     570 # it under the terms of the GNU General Public License as published by
     571 # the Free Software Foundation; either version 2 of the License, or
     572--- yum/pkgtag_db.py.orig       2010-05-06 16:54:46.000000000 +0200
     573+++ yum/pkgtag_db.py    2010-11-26 12:03:59.000000000 +0100
     574@@ -1,4 +1,4 @@
     575-#!/usr/bin/python -tt
     576+#!@@PYTHON@@ -tt
     577 # This program is free software; you can redistribute it and/or modify
     578 # it under the terms of the GNU General Public License as published by
     579 # the Free Software Foundation; either version 2 of the License, or
Note: See TracChangeset for help on using the changeset viewer.