[apt-proxy-devel] r591 - in people/halls/rework: . apt_proxy
apt_proxy/twisted_compat bin debian debian/po doc doc/po
Chris Halls
halls at costa.debian.org
Tue Feb 14 14:12:34 UTC 2006
Author: halls
Date: Tue Feb 14 14:12:33 2006
New Revision: 591
Added:
people/halls/rework/apt_proxy/twisted_compat/http.py
- copied unchanged from r590, trunk/apt_proxy/twisted_compat/http.py
people/halls/rework/debian/po/ru.po
- copied unchanged from r590, trunk/debian/po/ru.po
Modified:
people/halls/rework/ (props changed)
people/halls/rework/apt_proxy/misc.py
people/halls/rework/apt_proxy/twisted_compat/compat.py
people/halls/rework/bin/apt-proxy-import
people/halls/rework/debian/changelog
people/halls/rework/debian/control
people/halls/rework/debian/rules
people/halls/rework/doc/apt-proxy.conf.5
people/halls/rework/doc/po/apt-proxy.pot
Log:
Merge changes 572:590 from trunk
Modified: people/halls/rework/apt_proxy/misc.py
==============================================================================
--- people/halls/rework/apt_proxy/misc.py (original)
+++ people/halls/rework/apt_proxy/misc.py Tue Feb 14 14:12:33 2006
@@ -76,7 +76,7 @@
"Useful to save typing on new debuging messages"
if self.isEnabled(domain, level):
try:
- python.log.debug("[%s] %s"%(domain, msg))
+ python.log.msg("[%s] %s"%(domain, msg), debug=True)
except IOError:
pass
def err(self, msg, domain='error', level=9):
Modified: people/halls/rework/apt_proxy/twisted_compat/compat.py
==============================================================================
--- people/halls/rework/apt_proxy/twisted_compat/compat.py (original)
+++ people/halls/rework/apt_proxy/twisted_compat/compat.py Tue Feb 14 14:12:33 2006
@@ -2,7 +2,7 @@
#This is a gross hack to get non-released features
update_needed=0
-if copyright.version in ("0.99.2","1.0.0", "1.2.0", "1.3.0rc1", "2.0.1"):
+if copyright.version in ("0.99.2","1.0.0", "1.2.0", "1.3.0rc1", "2.0.1", "2.1.0"):
#print "Updating twisted's process module."
if not update_needed:
pass
Modified: people/halls/rework/bin/apt-proxy-import
==============================================================================
--- people/halls/rework/bin/apt-proxy-import (original)
+++ people/halls/rework/bin/apt-proxy-import Tue Feb 14 14:12:33 2006
@@ -78,13 +78,14 @@
if config.opts['debug']:
print 'debug'
- apiConfig.setDebug({'all':9})
+ apiConfig.setDebug('all:9')
elif config.opts['verbose']:
print "verbose"
- apiConfig.setDebug({'all':5})
+ apiConfig.setDebug('all:5')
if config.opts['quiet']:
- apiConfig.setDebug({'all':0})
+ apiConfig.setDebug('all:0')
factory=Factory(apiConfig)
+factory.configurationChanged() # Load backends
for import_dir in config.importargs:
packages.import_directory(factory, import_dir, config.opts['recursive'])
Modified: people/halls/rework/debian/changelog
==============================================================================
--- people/halls/rework/debian/changelog (original)
+++ people/halls/rework/debian/changelog Tue Feb 14 14:12:33 2006
@@ -1,6 +1,6 @@
-apt-proxy (1.9.32+svn) unstable; urgency=low
+apt-proxy (1.9.33+svn) unstable; urgency=low
- (New changelog because these changes are for post 1.9.32
+ (New changelog because these changes are for post 1.9.33)
[ Chris Halls ]
* http_proxy can now be set in each [backend] section
* Add support for username and password in http_proxy parameter.
@@ -10,12 +10,31 @@
-- Chris Halls <halls at debian.org> Tue, 11 Oct 2005 16:25:06 +0100
-apt-proxy (1.9.31+svn) unstable; urgency=low
+apt-proxy (1.9.33) unstable; urgency=low
+
+ [ Chris Halls ]
+ * Update for twisted 2.1.0. Thanks Tuncer Ayazi and Andreas Pakulat for
+ their patches and suggestions.
+ * Depend on python-twisted-web if using twisted > 2.0.1 (Closes: #349596)
+ * Remove use of deprecated arm calls (Closes: #349447)
+ * Rework apt-proxy.conf manpage. Thanks to Roey Katz for all the
+ suggestions
+ * debian/rules: swap dh_python and dh_installinit calls, so that
+ update-python-modules is called before init script in postinst
+
+ [ Debconf Translations ]
+ * Yuriy Talakan <yt at amur.elektra.ru>: ru.po (closes: #310326)
+
+ -- Chris Halls <halls at debian.org> Thu, 26 Jan 2006 11:59:56 +0000
+
+apt-proxy (1.9.32) unstable; urgency=low
[ Chris Halls ]
* Add support for file:// backends. Thanks to Michael Vogt for
the patch. FetcherFile is renamed to FetcherCachedFile and
FetcherFile is now the file: backend.
+ * Change apt-proxy-import command line: files/directories to import are
+ specified as regular parameters instead of using -i switch
* Add --config-file command line option to apt-proxy and apt-proxy-import
so more than one apt-proxy can be started independently. This makes
it possible to test apt-proxy in parallel with the system version.
@@ -33,7 +52,8 @@
* Add debconf-2.0 as alternative to satisfy debconf requirement to
run. This will be need for transition to cdebconf later
* Use twisted.web.http instead of twisted.protocols.http, which is
- depreciated in twisted 2
+ depreciated in twisted 2 but only if running with newer versions of
+ twisted library
* Bump Standards-Version to 3.6.2. No changes needed
* Only use update-inetd on upgrades and then we check if it exists
before calling it. That way we avoid a dependency on netbase
@@ -41,7 +61,7 @@
* Call debconf-updatepo in package clean target
* Update pt_BR debconf translations
- -- Chris Halls <halls at debian.org> Thu, 18 Aug 2005 16:50:47 +0100
+ -- Otavio Salvador <otavio at debian.org> Fri, 19 Aug 2005 14:22:25 -0300
apt-proxy (1.9.31) unstable; urgency=low
Modified: people/halls/rework/debian/control
==============================================================================
--- people/halls/rework/debian/control (original)
+++ people/halls/rework/debian/control Tue Feb 14 14:12:33 2006
@@ -8,13 +8,11 @@
Package: apt-proxy
Architecture: all
-Depends: debconf (>= 0.5.00) | debconf-2.0, ${python:Depends}, python-twisted (>= 1.3.0-7) | python2.3 (<< 2.3.5-1), python-twisted (>= 1.0.0), python-apt (>= 0.5.8), python-bsddb3, bzip2, logrotate, adduser
+Depends: debconf (>= 0.5.00) | debconf-2.0, ${python:Depends}, python-twisted (>= 1.3.0-7) | python2.3 (<< 2.3.5-1), python-twisted (>= 1.0.0), python-twisted-web | python-twisted (<< 2.1.0) python-apt (>= 0.5.8), python-bsddb3, bzip2, logrotate, adduser
Conflicts: apt-proxy-v2 (<= 1.9.5)
Replaces: apt-proxy-v2 (<= 1.9.5)
Suggests: rsync
-Description: Debian archive proxy and partial mirror builder development
- This is version 2 of apt-proxy which will, when ready, replace apt-proxy v1.
- .
+Description: Debian archive proxy and partial mirror builder
apt-proxy automatically builds a Debian HTTP mirror based
on requests which pass through the proxy. It's great for
multiple Debian machines on the same network with a slower
Modified: people/halls/rework/debian/rules
==============================================================================
--- people/halls/rework/debian/rules (original)
+++ people/halls/rework/debian/rules Tue Feb 14 14:12:33 2006
@@ -34,8 +34,8 @@
dh_installman
dh_installchangelogs
dh_installlogrotate
- dh_installinit
dh_python
+ dh_installinit
#install -g root -o root -m 755 \
# apt-proxy debian/apt-proxy/usr/sbin/apt-proxy
Modified: people/halls/rework/doc/apt-proxy.conf.5
==============================================================================
--- people/halls/rework/doc/apt-proxy.conf.5 (original)
+++ people/halls/rework/doc/apt-proxy.conf.5 Tue Feb 14 14:12:33 2006
@@ -1,14 +1,22 @@
.\" Man page copied from apt.conf man page.
-.TH "apt\-proxy\&.conf" "5" "21 Nov 2002" "apt\-proxy" ""
+.TH "apt\-proxy\&.conf" "5" "5 Jan 2006" "apt\-proxy" ""
.SH "NAME"
apt\-proxy\&.conf \- configuration file for apt\-proxy
.PP
.SH "DESCRIPTION"
\fBapt\-proxy\&.conf\fP is the configuration file for apt\-proxy.
-When apt\-proxy starts up, it will read \fB/etc/apt\-proxy/apt\-proxy\&.conf\fP\&.
+When apt\-proxy starts up, it will read \fI/etc/apt\-proxy/apt\-proxy\&.conf\fP\&.
-\fB/etc/apt\-proxy/apt\-proxy-v2\&.conf\fP will be read instead if it exists to
+\fI/etc/apt\-proxy/apt\-proxy-v2\&.conf\fP will be read instead if it exists to
make upgrading from v1 easier.
+
+The configuration file is divided up into several sections, where each \fI[resource]\fP
+section defines a seperate resource. The \fBDEFAULT\fP section applies to all resources.
+
+The supplied \fIapt\-proxy\&.conf\fP will work out of the box, but it is best to
+change the backends you use to a mirror closer to you. There are some in the
+default file, and it may be enough just to reorder the lines in the file\&.
+
.PP
.SH [DEFAULT]
This section holds options global to the whole apt\-proxy:
@@ -81,32 +89,36 @@
http pipelining. Default: 1
.PP
-.SH BACKENDS
-All other sections will be interpreted as backend names, and the options
-specified within are local to the backend.
-
-The supplied apt\-proxy\&.conf will work out of the box, but I suggest you
-look for a mirror closer to you\&. There are some in the default
-apt\-proxy\&.conf and it may be enough just to reorder the lines in the file\&.
+.SH RESOURCES
+All other sections in the configuration file will be interpreted as resource
+names. The options in the section apply to this resource only.
.TP
.B timeout
Overrides the global timeout
.TP
-.B backends = "<protocol>://<server>/<directory>"
-A list of backend URLs\&.
+.B backends = "\fI<protocol>\fP://\fI<server>\fP/\fI<directory>\fP [...]"
+A list one or more URLs referring to servers which hold debian packages\&.
.br
-Protocol \- internet protocol to use: http, ftp or rsync
.br
-Server \- hostname of the backend server to contact
+\fIprotocol\fP: internet protocol to use: http, ftp or rsync
.br
-Directory \- directory name to prepend requests to for this server
+\fIserver\fP: hostname of the backend server to contact
+.br
+\fIdirectory\fP: directory name to prepend requests to for this server
.TP
.B passive_ftp
Override the global setting of passive_ftp
+.SH CONFIGURATION EXAMPLES
+
+To access a resource that's listed under a specific section name, simply append
+the section name (without the brackets) to the end of your deb source line in
+/etc/apt/sources.list
+
+.B Debian main
.PP
This example shows how to give clients access to the main Debian
archive:
@@ -117,11 +129,11 @@
.fi
.PP
-Using this configuration, the client would use a \fBsources.list\fP entry
+Using this configuration, the client would use a \fIsources.list\fP entry
like:
.nf
- deb http://server:9999/debian/ woody main
+ deb http://server:9999/debian woody main
.fi
And so the file request
@@ -137,11 +149,37 @@
`http://ftp.de.debian.org/debian/woody/main/binary\-i386/x11/foo_1\-1.deb'
-.nf
-and the file would be placed in
+.fi
+and apt\-proxy will place the downloaded package in
.nf
`/var/cache/apt\-proxy/debian/debian/woody/main/binary\-i386/x11/foo_1\-1.deb'\&.
+.fi
+.B backports.org
+.PP
+The backports.org website tells you to use this \fIsources.list\fP line:
+.nf
+
+ deb http://www.backports.org/debian sarge-backports main
+
+.fi
+You can add this to apt\-proxy by creating a new section in \fIapt\-proxy\&.conf\fP\&.
+In the new section, add a backends entry for the URL:
+.nf
+
+ [backports]
+ backends = http://www.backports.org/debian
+
+.fi
+On the clients, replace the URL with one pointing to the apt-proxy resource name, in
+the form \fIhttp://hostname:port/backend\fP. If your apt-proxy hostname is \fIproxy\fP and
+it is running on port 9999, you would write:
+.nf
+
+ deb http://proxy:9999/backports sarge-backports main
+
+.fi
+
.PP
For many more examples, see the supplied /etc/apt\-proxy/apt\-proxy\&.conf\&.
Modified: people/halls/rework/doc/po/apt-proxy.pot
==============================================================================
--- people/halls/rework/doc/po/apt-proxy.pot (original)
+++ people/halls/rework/doc/po/apt-proxy.pot Tue Feb 14 14:12:33 2006
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-08-18 12:19-0300\n"
+"POT-Creation-Date: 2005-08-19 14:21-0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
More information about the apt-proxy-devel
mailing list