--- yum-3.2.25.orig/debian/yum-updatesd-defaults
+++ yum-3.2.25/debian/yum-updatesd-defaults
@@ -0,0 +1,10 @@
+# yum-updatesd is used to warn you about the fact that some RPMs might be
+# outdated on your system, and need an update.
+# As I think that in most cases, we don't need to run the yum-updatesd
+# daemon in Debian (yum is used for another purpose than managing the
+# system itself, like bootstraping foreign systems), I have decided to
+# disable this daemon by default. If you want to re-enable it, just set this
+# variable to yes (lower case please). Any other value will disable it.
+
+START_YUM_UPDATESD=no
+
--- yum-3.2.25.orig/debian/control
+++ yum-3.2.25/debian/control
@@ -0,0 +1,29 @@
+Source: yum
+Section: admin
+Priority: extra
+Maintainer: Thomas Goirand <thomas@goirand.fr>
+Dm-Upload-Allowed: yes
+Build-Depends: debhelper (>= 5.0.0), dpatch
+Build-Depends-Indep: python-dev, python-support (>= 0.4), intltool
+Standards-Version: 3.8.3
+Homepage: http://yum.baseurl.org/
+
+Package: yum
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python (>= 2.5) | python-celementtree, python-libxml2, python-urlgrabber, rpm (>= 4.4.1), python-rpm, python-sqlitecachec, python-sqlite
+Description: Advanced front-end for rpm
+ Yum (Yellow dog Updater, Modified) is an automatic updater and package
+ installer/remover for rpm systems. It automatically computes dependencies
+ and figures out what things should occur to install packages. It makes it
+ easier to maintain groups of machines without having to manually update
+ each one using rpm.
+ .
+ Features include:
+ .
+ * Multiple Repositories
+ * Simple config file
+ * Correct dependency calculation
+ * Fast operation
+ * rpm-consistent behavior
+ * comps.xml group support, including multiple repository groups
+ * Simple interface
--- yum-3.2.25.orig/debian/copyright
+++ yum-3.2.25/debian/copyright
@@ -0,0 +1,86 @@
+This package was debianized by Anand Kumria <wildfire@progsoc.org> on
+Wed, 26 Oct 2005 03:48:14 +1000.
+
+It was downloaded from: http://yum.baseurl.org/
+
+YUM aythors, list taken from the upstream AUTHORS file, email addresses taken
+from the <yum-devel@lists.baseurl.org> mailing list (as there was none in the
+AUTHORS file) where patches are sent and few names added from there:
+
+ Seth Vidal <skvidal@fedoraproject.org> (lead)
+ Jeremy Katz <katzj@fedoraproject.org>
+ Adrian Likins
+ Matthew Miller
+ Michael Stenner
+ Icon Riabitsev
+ Ryan Tomayko
+ Paul Nasrat
+ Robert G. Brown
+ Hollis Blanchard
+ Grigory Bakunov
+ Menno Smits
+ Gijs Hollestelle
+ Terje Rosten
+ Luke Macken
+ James Bowes
+ Tim Lauridsen <tim.lauridsen@googlemail.com>
+ Florian Festi
+ Jack Neely
+ James Antill <james@and.org>
+ Panu Matilainen
+ Tambet Ingo
+ Mike Bonnet <mikeb@redhat.com>
+ Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>
+ Ville Skyttä <ville.skytta@iki.fi>
+
+Original Yup people:
+
+ Bryan Stillwell
+ Stephen Edie
+ Dan Burcaw
+ Troy Bengegerdes
+
+Files: debian/*
+Copyright: (c) 2008-2009, Thomas Goirand <thomas@goirand.fr>
+ (c) 2005-2006, Anand Kumria <wildfire@progsoc.org>
+License: LGPL
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+ USA
+
+On Debian systems, the complete text of the GNU Lesser General Public
+License (LGPL) may be found in /usr/share/common-licenses/LGPL.
+
+Files: *
+Copyright: (c) 2003-2004, Seth Vidal, Duke University <skvidal@fedoraproject.org>
+ (c) 2005-2009, Seth Vidal <skvidal@fedoraproject.org>
+License: GPL-2
+
+ This package 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
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
--- yum-3.2.25.orig/debian/yum-updatesd.init
+++ yum-3.2.25/debian/yum-updatesd.init
@@ -0,0 +1,76 @@
+#!/bin/sh
+#
+# yum Yum updates daemon.
+#
+# Written by Andres Salomon <dilinger@debian.org>
+#
+### BEGIN INIT INFO
+# Provides: yum-updatesd
+# Required-Start:
+# Required-Stop:
+# Should-Start: $syslog $network $local_fs
+# Should-Stop: $syslog $network $local_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Yum updates daemon
+# Description: yum-updatesd is a daemon which periodically checks for
+# (rpm) package updates, and can send notifications via
+# mail, dbus, or syslog.
+### END INIT INFO
+
+DAEMON=/usr/sbin/yum-updatesd
+NAME=yum-updatesd
+DESC=yum-updatesd
+CONFIG=/etc/yum/yum-updatesd.conf
+PIDFILE=/var/run/yum-updatesd.pid
+
+# Exit if START_YUM_UPDATESD is not "yes" in /etc/default/yum-updatesd
+if [ -f /etc/default/yum-updatesd ] ; then
+ . /etc/default/yum-updatesd
+fi
+if ! [ "${START_YUM_UPDATESD}" = yes ] ; then
+ exit 0
+fi
+
+test -f $DAEMON || exit 0
+test -f $CONFIG || exit 0
+
+. /lib/lsb/init-functions
+
+case "$1" in
+start)
+ log_daemon_msg "Starting $DESC" "$NAME"
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
+ --nicelevel 19 --exec $DAEMON
+ log_end_msg $?
+ ;;
+stop)
+ log_daemon_msg "Stopping $DESC" "$NAME"
+ start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+ --exec $DAEMON
+ log_end_msg $?
+ ;;
+restart)
+ log_daemon_msg "Restarting $DESC" "$NAME"
+ start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \
+ --exec $DAEMON
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
+ --nicelevel 19 --exec $DAEMON
+ log_end_msg $?
+ ;;
+reload|force-reload)
+ log_daemon_msg "Reloading configuration files for $DESC" "$NAME"
+ if start-stop-daemon --stop --quiet --signal 1 --pidfile $PIDFILE \
+ --exec $DAEMON; then
+ log_end_msg 0
+ else
+ log_action_end_msg 1
+ fi
+ ;;
+*)
+ log_action_msg "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
+ exit 2
+ ;;
+esac
+
+exit 0
--- yum-3.2.25.orig/debian/README.Debian
+++ yum-3.2.25/debian/README.Debian
@@ -0,0 +1,21 @@
+yum for Debian
+--------------
+Yum requires a working rpm installation. By default the rpm package does not
+create a completely working one lest beginners shoot themselves in the foot.
+
+You should:
+ - mkdir /var/lib/rpm
+ - rpm --initdb
+prior to using yum.
+
+Be aware that the only usage of yum in Debian is to perform chroot (Xen, UML)
+of Fedora, RHEL, CentOS, etc. installs. We, at GPLHost, use a specific
+bootstrap script for doing this with CentOS. Such script is shipped with
+DTC-Xen (also in Debian).
+
+This package was not, is not, and will never be, a replacement for apt-get when
+using Debian or any other .deb based distribution. So please, do NOT ask about
+it, or do not send any bug entry for this, or you'll get flamed for not reading
+the README.Debian as anyone should.
+
+ -- Thomas Goirand <thomas@goirand.fr> Sat, 26 Dec 2009 13:05:37 +0800
--- yum-3.2.25.orig/debian/docs
+++ yum-3.2.25/debian/docs
@@ -0,0 +1,7 @@
+debian/README.source
+debian/README.Debian
+FAQ
+PLUGINS
+README
+TODO
+AUTHORS
--- yum-3.2.25.orig/debian/compat
+++ yum-3.2.25/debian/compat
@@ -0,0 +1 @@
+5
--- yum-3.2.25.orig/debian/rules
+++ yum-3.2.25/debian/rules
@@ -0,0 +1,82 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+include /usr/share/dpatch/dpatch.make
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+configure: configure-stamp
+configure-stamp: patch-stamp
+ dh_testdir
+ # Add here commands to configure the package.
+
+ touch configure-stamp
+
+#Architecture
+build: build-indep
+build-indep: build-indep-stamp
+build-indep-stamp: configure-stamp
+
+ # Add here commands to compile the indep part of the package.
+ #$(MAKE) doc
+ $(MAKE)
+ touch build-indep-stamp
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-indep-stamp
+
+ # Delete po/yum.pot so it doesn't polute the diff.gz
+ rm -f po/yum.pot
+
+ # Add here commands to clean up after the build process.
+ [ ! -f Makefile ] || $(MAKE) clean
+
+ dh_clean
+
+install: install-indep
+install-indep:
+ dh_testdir
+ dh_testroot
+ dh_clean -k -i
+ dh_installdirs -i
+
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/yum
+
+ # Install our /etc/default file to disable yum-updatesd by default
+ install -D -m 0644 debian/yum-updatesd-defaults $(CURDIR)/debian/yum/etc/default/yum-updatesd
+
+ # In Debian, it's not etc/rc.d but etc/init.d, plus we use OUR (eg:
+ # Debian specific) init.d script instead.
+ rm -rf $(CURDIR)/debian/yum/etc/rc.d
+ chmod 0644 $(CURDIR)/debian/yum/etc/yum/yum-updatesd.conf
+ chmod 0644 $(CURDIR)/debian/yum/etc/dbus-1/system.d/yum-updatesd.conf
+
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs ChangeLog
+ dh_installdocs
+ dh_installexamples
+ dh_installinit --name=yum-updatesd
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_pysupport /usr/share/yum-cli
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+binary: binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
--- yum-3.2.25.orig/debian/watch
+++ yum-3.2.25/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://yum.baseurl.org/download/3.2/yum-(.*).tar.gz
--- yum-3.2.25.orig/debian/README.source
+++ yum-3.2.25/debian/README.source
@@ -0,0 +1,3 @@
+This package uses the old dpatch system, and not yet Quilt, so it's easy to
+backport to Lenny. Please bare with me. As soon as Squeeze will be out, I'll
+switch to using the more powerful Quilt format for the next Debian release.
--- yum-3.2.25.orig/debian/dirs
+++ yum-3.2.25/debian/dirs
@@ -0,0 +1,7 @@
+usr/bin
+usr/sbin
+etc/yum/repos.d
+etc/init.d
+etc/dbus-1/system.d
+var/cache/yum
+var/lib/yum
--- yum-3.2.25.orig/debian/yum-doc.docs
+++ yum-3.2.25/debian/yum-doc.docs
@@ -0,0 +1,2 @@
+#DOCS#
+
--- yum-3.2.25.orig/debian/changelog
+++ yum-3.2.25/debian/changelog
@@ -0,0 +1,149 @@
+yum (3.2.25-1) unstable; urgency=low
+
+ * New upstream version.
+ * Not using the yumpackage@gplhost.com, but my "normal" email address again
+ as maintainer address, as my employee Manuel is no longer willing to help,
+ as he resigned from his position at GPLHost.
+ * Removed patches that are no longer needed thanks to my work with upstream:
+ - yum.conf.5 has been corrected thanks to a patch I sent to upstream, so
+ a patch in Debian is no longer needed, same for the yum.8 man page.
+ - python-iniparse has been uploaded to SID, so a patch to not use it is as
+ well not needed anymore.
+ - python-gpgme is now in SID.
+ - The version of logrotate in SID now supports yearly rotating, so a
+ patch is no longer needed as well.
+ All together, the number of patches needed for Yum is reduced to only 1,
+ making it A WAY more easy to maintain.
+ * Changed dependency from just python-celementtree to python (>= 2.5) |
+ python-celementtree as python-celementtree is now part of python2.5, and
+ that python2.4 is to be removed from SID (Closes: #562455).
+ * Bumped Standards-Version.
+ * Reworked a bit the debian/copyright so it's more accurate.
+ * Reworked the debian/README.Debian, wrote a debian/source.
+ * Switched from Required to Should in the debian/yum-updatesd.init, added
+ a $local_fs as Should also, and did some tiny cleanups in debian/rules.
+
+ -- Thomas Goirand <thomas@goirand.fr> Sat, 26 Dec 2009 13:05:37 +0800
+
+yum (3.2.23-1) unstable; urgency=low
+
+ * New upstream release
+ * Removed the patch for the Makefile that is now useless (upstream changed
+ it).
+ * Compat is now 5.
+
+ -- GPLHost yum packaging team <yumpackage@gplhost.com> Sat, 13 Jun 2009 19:23:21 +0800
+
+yum (3.2.21-2) unstable; urgency=low
+
+ * Moved python-dev, python-support and intltool to Build-Depends-Indep:
+ * Added a Homepage: field and a watch file
+ * Added mechanismes in debian/rules to preserve po/yum.pot that is created
+ each time by the build process (the .diff.gz was big for nothing, this is
+ better now).
+ * Added a patch so that etc/yum.logrotate uses monthly as logrotate option,
+ as we received cron emails from some of our servers in production, warning
+ that yearly is not a valid option for logrotate. The cron job for
+ logrotate should be more quite now.
+ * Now depending on debhelper >= 5.
+ * Bumped StandardVersion to 3.8.1.
+
+ -- GPLHost yum packaging team <yumpackage@gplhost.com> Wed, 01 Apr 2009 11:14:48 +0800
+
+yum (3.2.21-1) unstable; urgency=low
+
+ * Adopting package. Former maintainer retired from Debian recently, and
+ co-maintainer expressed he had no further interest in yum in
+ http://lists.debian.org/debian-release/2009/02/msg00413.html.
+ I (Thomas Goirand) will be co-maintaining this package with my employee
+ Manuel Amador: I feel comfortable with Debian packaging, while Manuel is
+ a python and RPM system specialist. The maintainer email address of this
+ package (signed with my Debian GPG key) forwards to both of us.
+ * New upstream release
+ * Added Dm-Upload-Allowed: yes field.
+ * Forward-ported documentation, sqlite and Makefile patch from last Debian
+ package in Lenny, added build-dep dpatch (patches are now separate and not
+ generated in the diff.gz which I think is ugly packaging).
+ * Removed upstream dependency on python-iniparse and patched to be able to
+ work without it as python-iniparse is not in Debian (yet).
+ * Removed Debian dependency on python-pyme (which is a mistake of the last
+ NMU that thought it was the same as python-gpgme), removed upstream
+ dependency on python-gpgme, patched to work without it (Closes: #496137).
+ * Note: this is only a temporary package before we can have python-gpgme,
+ and python-iniparse inside Debian. This package version aims at a qa upload
+ to fix the current situation in Lenny where the yum package is broken
+ because it is trying to call a python module that doesn't exists in Lenny
+ (see src/misc.py and our patch for it). It seems that 2 other maintainers
+ have already started working on packaging python-gpgme and python-iniparse.
+
+ -- GPLHost yum packaging team <yumpackage@gplhost.com> Sun, 01 Mar 2009 18:08:07 +0800
+
+yum (3.2.12-1.2) unstable; urgency=low
+
+ * Non-maintainer upload
+ * Updated for compatibility with current python-pyme (Closes: #490368)
+ based on patch by Martin Meredith <mez@ubuntu.com>
+ - Changed import in yum/misc.py
+ - Set versioned dependency on python-pyme
+
+ -- Ben Hutchings <ben@decadent.org.uk> Mon, 28 Jul 2008 23:20:59 +0100
+
+yum (3.2.12-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with dash (Closes: #471758)
+ * Fix 'copyright-without-copyright-notice' lintian warning.
+
+ -- Chris Lamb <chris@chris-lamb.co.uk> Fri, 11 Apr 2008 19:21:33 +0100
+
+yum (3.2.12-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add a build-dep on intltool.
+
+ -- Andres Salomon <dilinger@debian.org> Fri, 07 Mar 2008 15:02:44 +0000
+
+yum (3.2.10-1) unstable; urgency=low
+
+ * New upstream release (Closes: #364105).
+ * Add myself as a co-maintainer.
+ * Fix up yum-updatesd stuff, including adding an init script.
+ * Silence some lintian warnings/errors.
+ * Add dependencies on some additional python modules; python-pyme,
+ python-sqlitecachec, python-sqlite.
+ * Patch yum/misc.py to use the proper module path; pyme.gpgme,
+ rather than just gpgme.
+ * Patch yum/sqlutils.py to use Qmark format rather than sqlite1
+ syntax; the version_info check ends up being incorrect.
+
+ -- Andres Salomon <dilinger@debian.org> Tue, 05 Feb 2008 18:14:38 +0000
+
+yum (2.4.0-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update package to the last python policy (Closes: #380993).
+ * Urgency set to medium for RC bug fix.
+ * Bump Standards-Version to 3.7.2.
+ * Fixing bashism in docs/Makefile.
+ * removing debian/*.ex files.
+
+ -- Pierre Habouzit <madcoder@debian.org> Wed, 30 Aug 2006 13:43:22 +0200
+
+yum (2.4.0-3) unstable; urgency=low
+
+ * Further corrections to the dependancies (Closes: #340914)
+
+ -- Anand Kumria <wildfire@progsoc.org> Mon, 28 Nov 2005 02:46:37 +1100
+
+yum (2.4.0-2) unstable; urgency=low
+
+ * Add dependancy on python-urlgrabber
+
+ -- Anand Kumria <wildfire@progsoc.org> Mon, 31 Oct 2005 05:08:38 +1100
+
+yum (2.4.0-1) unstable; urgency=low
+
+ * Initial release
+
+ -- Anand Kumria <wildfire@progsoc.org> Wed, 26 Oct 2005 03:48:14 +1000
+
--- yum-3.2.25.orig/debian/patches/0004-logrotate-monthly.dpatch
+++ yum-3.2.25/debian/patches/0004-logrotate-monthly.dpatch
@@ -0,0 +1,20 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 0004-logrotate-monthly.dpatch by Thomas Goirand <thomas@goirand.fr>
+##
+## DP: Changes the logrotate option from yearly to monthly, as yearly in fact does not
+## DP: exists in Debian Lenny: in Debian Lenny, logrotate is in version 3.7.1, and the
+## DP: yearly option appears in version 3.7.2. As of writting, SID uses 3.7.3 so it is
+## DP: already not an issue in it. This patch will be removed when yum reaches Lenny
+## DP: proposed updates.
+
+@DPATCH@
+--- yum-3.2.21.orig/etc/yum.logrotate 2009-04-01 10:47:14.000000000 +0800
++++ yum-3.2.21/etc/yum.logrotate 2009-04-01 10:48:05.000000000 +0800
+@@ -2,6 +2,6 @@
+ missingok
+ notifempty
+ size 30k
+- yearly
++ monthly
+ create 0600 root root
+ }
--- yum-3.2.25.orig/debian/patches/0002-Make-compatible-with-SQLite.dpatch
+++ yum-3.2.25/debian/patches/0002-Make-compatible-with-SQLite.dpatch
@@ -0,0 +1,27 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 0002-Make-compatible-with-SQLite.dpatch by Manuel Amador (Rudd-O) <rudd-o@rudd-o.com>
+##
+## DP: Forward-ported old sqlite patch to make it compatible with SQLite
+
+@DPATCH@
+diff --git a/yum/sqlutils.py b/yum/sqlutils.py
+index 58b63ab..0605cf7 100644
+--- a/yum/sqlutils.py
++++ b/yum/sqlutils.py
+@@ -162,10 +162,9 @@ def executeSQLQmark(cursor, query, params=None):
+
+ return cursor.execute(query, params)
+
+-if sqlite.version_info[0] > 1:
+- executeSQL = executeSQLQmark
+-else:
+- executeSQL = executeSQLPyFormat
++# debian's pysqlite2 is built against sqlite3
++executeSQL = executeSQLQmark
++
+
+
+
+--
+1.5.6.5
+
--- yum-3.2.25.orig/debian/patches/0003-Removed-iniparse-dependency.dpatch
+++ yum-3.2.25/debian/patches/0003-Removed-iniparse-dependency.dpatch
@@ -0,0 +1,48 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 0003-Removed-iniparse-dependency.dpatch by Manuel Amador (Rudd-O) <rudd-o@rudd-o.com>
+##
+## DP: Replace iniparse by ConfigParser and removes the dependency
+## DP: This is a temporary fix, as Lenny doesn't have the python-iniparse
+## DP: package available. This will be removed from the SID package when
+## DP: the above package is uploaded.
+
+@DPATCH@
+diff --git a/yum/config.py b/yum/config.py
+index 2219605..6fa1e09 100644
+--- a/yum/config.py
++++ b/yum/config.py
+@@ -25,9 +25,7 @@ import rpm
+ import copy
+ import urlparse
+ from parser import ConfigPreProcessor
+-from iniparse import INIConfig
+-from iniparse.compat import NoSectionError, NoOptionError, ConfigParser
+-from iniparse.compat import ParsingError
++from ConfigParser import ConfigParser,NoSectionError, NoOptionError, ParsingError
+ import rpmUtils.transaction
+ import rpmUtils.arch
+ import Errors
+@@ -861,16 +859,17 @@ def writeRawRepoFile(repo,only=None):
+ @param only: List of attributes to work on (None = All)
+ It work by reading the repo file, changes the values there shall be changed and write it back to disk.
+ """
+- ini = INIConfig(open(repo.repofile))
++ cp = ConfigParser()
++ cp.read([repo.repofile])
+ # Updated the ConfigParser with the changed values
+ cfgOptions = repo.cfg.options(repo.id)
+ for name,value in repo.iteritems():
+ option = repo.optionobj(name)
+ if option.default != value or name in cfgOptions :
+ if only == None or name in only:
+- ini[repo.id][name] = option.tostring(value)
++ cp.set(repo.id,name,option.tostring(value))
+ fp =file(repo.repofile,"w")
+- fp.write(str(ini))
++ cp.write(fp)
+ fp.close()
+
+ #def main():
+--
+1.5.6.5
+
--- yum-3.2.25.orig/debian/patches/0009-yum-manpages.dpatch
+++ yum-3.2.25/debian/patches/0009-yum-manpages.dpatch
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0009-yum-manpages.dpatch by Thomas Goirand <thomas@goirand.fr>
+##
+## DP: This cleans all syntax errors in the man of yum.8 and yum.conf.5
+
+@DPATCH@
+--- yum-3.2.25.orig/docs/yum.conf.5 2009-10-12 21:58:13.000000000 +0800
++++ yum-3.2.25/docs/yum.conf.5 2009-12-26 13:49:47.000000000 +0800
+@@ -289,7 +289,7 @@
+ This is a list of package names that should be recorded as having helped the
+ transaction. yum plugins have an API to add themselves to this, so it should not
+ normally be necessary to add packages here. Not that this is also used for the
+-packages to look for in --version. Defaults to rpm, yum, yum-metadata-parser.
++packages to look for in \-\-version. Defaults to rpm, yum, yum-metadata-parser.
+
+ .IP
+ \fBcommands\fR
--- yum-3.2.25.orig/debian/patches/00list
+++ yum-3.2.25/debian/patches/00list
@@ -0,0 +1,2 @@
+0002-Make-compatible-with-SQLite.dpatch
+0009-yum-manpages.dpatch
--- yum-3.2.25.orig/debian/patches/0005-vserver-interface.dpatch
+++ yum-3.2.25/debian/patches/0005-vserver-interface.dpatch
@@ -0,0 +1,129 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0005_vserver_interface.dpatch by Philipp Kaluza <pk+debs@yomu.de>
+##
+## DP: This adds more fine control for setting up vservers.
+## DP: This is still controversal and needs to be discussed with the upstream
+## DP: developpers of yum.
+
+@DPATCH@
+diff -urNad yum-3.2.21~/cli.py yum-3.2.21/cli.py
+--- yum-3.2.21~/cli.py 2009-01-06 15:46:00.000000000 +0100
++++ yum-3.2.21/cli.py 2009-04-01 13:34:22.168245119 +0200
+@@ -1176,13 +1176,14 @@
+ def getRoot(self,opts):
+ # If the conf file is inside the installroot - use that.
+ # otherwise look for it in the normal root
++ if opts.conffile==None:
++ opts.conffile = '/etc/yum/yum.conf'
++ if opts.installroot:
++ if os.access(opts.installroot+opts.conffile, os.R_OK):
++ opts.conffile = opts.installroot+opts.conffile
++ elif os.access(opts.installroot+'/etc/yum.conf', os.R_OK):
++ opts.conffile = opts.installroot+'/etc/yum.conf'
+ if opts.installroot:
+- if os.access(opts.installroot+'/'+opts.conffile, os.R_OK):
+- opts.conffile = opts.installroot+'/'+opts.conffile
+- elif opts.conffile == '/etc/yum/yum.conf':
+- # check if /installroot/etc/yum.conf exists.
+- if os.access(opts.installroot+'/etc/yum.conf', os.R_OK):
+- opts.conffile = opts.installroot+'/etc/yum.conf'
+ root=opts.installroot
+ else:
+ root = '/'
+@@ -1216,7 +1217,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=None,
+ help=_("config file location"), metavar=' [config file]')
+ self.add_option("-R", dest="sleeptime", type='int', default=None,
+ help=_("maximum command wait time"), metavar=' [minutes]')
+diff -urNad yum-3.2.21~/yum/__init__.py yum-3.2.21/yum/__init__.py
+--- yum-3.2.21~/yum/__init__.py 2009-01-07 21:33:14.000000000 +0100
++++ yum-3.2.21/yum/__init__.py 2009-04-01 13:34:22.168245119 +0200
+@@ -289,8 +289,7 @@
+ self.getReposFromConfigFile(self.conf.config_file_path, repo_config_age)
+
+ for reposdir in self.conf.reposdir:
+- if os.path.exists(self.conf.installroot+'/'+reposdir):
+- reposdir = self.conf.installroot + '/' + reposdir
++ reposdir = self.conf.getRootedPath(reposdir)
+
+ if os.path.isdir(reposdir):
+ for repofn in glob.glob('%s/*.repo' % reposdir):
+@@ -1045,11 +1044,9 @@
+ # if we're not root then we don't lock - just return nicely
+ if self.conf.uid != 0:
+ return
+-
+- root = self.conf.installroot
+- lockfile = root + '/' + lockfile # lock in the chroot
+- lockfile = os.path.normpath(lockfile) # get rid of silly preceding extra /
+-
++
++ lockfile = self.conf.lockfile
++
+ mypid=str(os.getpid())
+ while not self._lock(lockfile, mypid, 0644):
+ fd = open(lockfile, 'r')
+@@ -1084,8 +1081,7 @@
+ return
+
+ if lockfile is not None:
+- root = self.conf.installroot
+- lockfile = root + '/' + lockfile # lock in the chroot
++ root = self.conf.lockfile
+ elif self._lockfile is None:
+ return # Don't delete other people's lock files on __del__
+ else:
+diff -urNad yum-3.2.21~/yum/config.py yum-3.2.21/yum/config.py
+--- yum-3.2.21~/yum/config.py 2009-04-01 13:34:22.012244915 +0200
++++ yum-3.2.21/yum/config.py 2009-04-01 13:34:22.168245119 +0200
+@@ -588,6 +588,26 @@
+ syslog_ident = Option()
+ syslog_facility = Option('LOG_DAEMON')
+
++ def getRootedPath(self, path, enforce_default=False, defaults_to_host=False):
++ instroot = getattr(self, 'installroot', None)
++ if instroot==None:
++ return path
++
++ if path.startswith('hostfs://'): res = path[9:]
++ elif path.startswith('chrootfs://'): res = instroot + '/' + path[11:]
++ else:
++ tmp = instroot + '/' + path
++
++ if enforce_default:
++ if defaults_to_host: res = path
++ else: res = tmp
++ else:
++ if os.path.exists(tmp): res = tmp
++ elif defaults_to_host: res = path
++ else: res = tmp
++
++ return res
++
+ class YumConf(StartupConf):
+ '''
+ Configuration option definitions for yum.conf\'s [main] section.
+@@ -601,6 +621,7 @@
+ persistdir = Option('/var/lib/yum')
+ keepcache = BoolOption(True)
+ logfile = Option('/var/log/yum.log')
++ lockfile = Option('/var/run/yum.pid')
+ reposdir = ListOption(['/etc/yum/repos.d', '/etc/yum.repos.d'])
+
+ commands = ListOption()
+@@ -776,9 +797,9 @@
+ yumconf.populate(startupconf._parser, 'main')
+
+ # Apply the installroot to directory options
+- for option in ('cachedir', 'logfile', 'persistdir'):
++ for option in ('cachedir', 'logfile', 'persistdir', 'lockfile'):
+ path = getattr(yumconf, option)
+- setattr(yumconf, option, yumconf.installroot + path)
++ setattr(yumconf, option, yumconf.getRootedPath(path))
+
+ # Add in some extra attributes which aren't actually configuration values
+ yumconf.yumvar = yumvars
![[patchlogo]](http://patch-tracker.debian.org/static/img/swirlpatch.png)