--- apt-cacher-ng-0.4.orig/debian/README.Debian +++ apt-cacher-ng-0.4/debian/README.Debian @@ -0,0 +1,45 @@ +apt-cacher-ng for Debian +------------------------ + +See apt-cacher-ng.pdf for configuration instructions (or HTML version or README). +The configuration directory on Debian systems is located in +/etc/apt-cacher-ng/. Some files which are unlikely to be changed are stored +outside of /etc and only symlinks to them are placed among other config files. +To make modifications, the symlink should be removed and original file moved to +previous symlink location. + + +REMOTE MIRROR CONFIGURATION +--------------------------- + +The Debian setup includes some semi-automatic backend configuration. The +remapping rules for many known mirrors are shipped with the package. On +installation, the setup script picks up a list of preferred backend hosts from +local machine's current sources.list files and puts them into +/etc/apt-cacher-ng/backends_* files. + +To change the mirrors used by apt-cacher-ng, user needs to add/remove/reorder +the lists in this backends files. To execute or enable automatic configuration, +run "dpkg-reconfigure apt-cacher-ng". + +SECURITY +-------- + +See apt-cacher-ng manual for details. On Debian systems, the file +/etc/apt-cacher-ng/security.conf is installed which contains security related +options (but it can be in any other *.conf file as well). Currently it sets the +"AdminAuth: user:pass" option to protect some action triggers in the web user +interface against unauthorized use. + +INETD USAGE +----------- + +For inetd usage, the in.acng binary is shipped with the Debian package. +However, it needs to be installed manually by adding the line: + +3142 stream tcp nowait apt-cacher-ng /usr/sbin/tcpd /usr/lib/apt-cacher-ng/in.acng /var/run/apt-cacher-ng/socket + +to /etc/inetd.conf and reload of the inetd daemon. The parameters above need to +be adapted as needed, also see the package documentation for more details. + + -- Eduard Bloch Mon, 25 May 2009 00:40:27 +0200 --- apt-cacher-ng-0.4.orig/debian/apt-cacher-ng.config +++ apt-cacher-ng-0.4/debian/apt-cacher-ng.config @@ -0,0 +1,13 @@ +#!/bin/sh -e + +. /usr/share/debconf/confmodule + +db_input medium apt-cacher-ng/modifytargets || true +db_go + +db_get apt-cacher-ng/modifytargets || true + +if [ "$RET" = "true" ] ; then + db_input medium apt-cacher-ng/gentargetmode || true + db_go +fi --- apt-cacher-ng-0.4.orig/debian/apt-cacher-ng.cron.daily +++ apt-cacher-ng-0.4/debian/apt-cacher-ng.cron.daily @@ -0,0 +1,19 @@ +#!/bin/sh +# Run the expire function of apt-cacher-ng non-interactively (unless errors +# are detected). + +# optional, specify hostname to appear in error messages and links +# HOSTNAME=externallyVisibleHostName +# export HOSTNAME + +# optional, specify IP address to connect to +# ACNGIP=10.0.1.3 +# export ACNGIP + +if perl -e 'use MIME::Base64' 2>/dev/null \ + && test -r /usr/lib/apt-cacher-ng/expire-caller.pl ; +then + perl /usr/lib/apt-cacher-ng/expire-caller.pl || echo Check error messages in /var/log/apt-cacher-ng/maint_*.log +else + echo $(date -R)\|/etc/cron.daily/apt-cacher-ng\| Error starting expiration helper. Install the perl package, check apt-cacher-ng installation. >> /var/log/apt-cacher-ng/apt-cacher.err +fi --- apt-cacher-ng-0.4.orig/debian/apt-cacher-ng.default +++ apt-cacher-ng-0.4/debian/apt-cacher-ng.default @@ -0,0 +1,18 @@ +# Defaults for apt-cacher-ng initscript +# sourced by /etc/init.d/apt-cacher-ng +# installed at /etc/default/apt-cacher-ng by the maintainer scripts + +# +# This is a POSIX shell fragment +# + +# Set to non-empty value to disable the start of the service at boot time +# DISABLED=1 + +# See umask(2) or chmod(1) for details. +# 002 would make new files writable by group. +# +# umask 022 + +# Additional options that are passed to the Daemon. +DAEMON_OPTS=" -c /etc/apt-cacher-ng " --- apt-cacher-ng-0.4.orig/debian/apt-cacher-ng.init +++ apt-cacher-ng-0.4/debian/apt-cacher-ng.init @@ -0,0 +1,87 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: apt-cacher-ng +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Default-Start: 2 3 5 +# Default-Stop: 0 6 +# Short-Description: Apt-Cacher NG package proxy +# Description: This script powers up the package proxy daemon +### END INIT INFO + +# Author: Eduard Bloch + +. /etc/default/rcS +. /lib/lsb/init-functions + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/apt-cacher-ng +NAME=apt-cacher-ng +DESC=apt-cacher-ng + +test -x $DAEMON || exit 0 + +# Include apt-cacher-ng defaults if available +if [ -f /etc/default/apt-cacher-ng ] ; then + . /etc/default/apt-cacher-ng +fi + +test -z "$DISABLED" || exit 0 + +# our runtime state files directory, will be purged on startup! +RUNDIR="/var/run/$NAME" + +PIDFILE="$RUNDIR/pid" +SOCKETFILE="$RUNDIR/socket" +DAEMON_OPTS="$DAEMON_OPTS pidfile=$PIDFILE SocketPath=$SOCKETFILE foreground=0" + +do_start() { + PIDOF=$(pidof apt-cacher-ng) + if [ -n "$PIDOF" ] && [ -e "$PIDFILE" ] && [ "$PIDOF" = "$(cat $PIDFILE)" ] ; then + return 255 + fi + rm -rf "$RUNDIR" || return 1 + install -d --mode=0755 -o $NAME -g $NAME "$RUNDIR" || return 1 + start-stop-daemon --start --chuid $NAME --group $NAME --quiet --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS +} + +do_stop() { + + if ! start-stop-daemon --stop --retry 15 --quiet --pidfile $PIDFILE \ + --exec $DAEMON + then + if ! test -e "$PIDFILE" && ! start-stop-daemon --stop \ + --retry TERM/10/KILL/5 --exec $DAEMON + then + return $? + fi + fi + rm -f $PIDFILE + return 0 + +} + +case "$1" in + start) + log_daemon_msg "Starting $DESC" "$NAME" + do_start + log_end_msg $? + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + log_end_msg $? + ;; + restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + do_start + log_end_msg $? + ;; + *) + echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + exit 3 + ;; +esac + +: --- apt-cacher-ng-0.4.orig/debian/apt-cacher-ng.logrotate +++ apt-cacher-ng-0.4/debian/apt-cacher-ng.logrotate @@ -0,0 +1,15 @@ +/var/log/apt-cacher-ng/*.log { + size 10M + missingok + rotate 12 + compress + delaycompress + notifempty + create + postrotate + if [ -s /var/run/apt-cacher-ng/pid ] ; then + kill -s USR1 "$(cat /var/run/apt-cacher-ng/pid)" + fi + endscript +} + --- apt-cacher-ng-0.4.orig/debian/apt-cacher-ng.postinst +++ apt-cacher-ng-0.4/debian/apt-cacher-ng.postinst @@ -0,0 +1,87 @@ +#!/bin/sh -e + +. /usr/share/debconf/confmodule + +NAME=apt-cacher-ng +CDIR=/var/cache/$NAME +LDIR=/var/log/$NAME +SLIST=/etc/apt/sources.list +CFG=/etc/apt-cacher-ng +DDIR=/usr/lib/apt-cacher-ng + +gen_mirror_list() { + + case "$2" in + *gz) + pickcmd=zgrep + ;; + *) + pickcmd=grep + ;; + esac; + + ( + grep -h '^deb' $SLIST.d/* $SLIST 2>/dev/null | sed -e "s,ftp:/,http:/," | \ + ( + while read a b c ; do + case "$b" in http*) $pickcmd "$b" "$2" || true ;; esac + done + ) # but don't add duplicates + ) | ( while read a ; do grep -q "$a" "$1" || echo "$a" >> "$1" ; done) +} + +reset_lists() { + > $CFG/backends_debian + > $CFG/backends_ubuntu + > $CFG/backends_debvol +} + +gen_lists() { + gen_mirror_list $CFG/backends_debian $DDIR/deb_mirrors.gz + gen_mirror_list $CFG/backends_ubuntu $DDIR/ubuntu_mirrors + gen_mirror_list $CFG/backends_debvol $DDIR/debvol_mirrors.gz +} + +if [ "$1" = "configure" ]; then + + adduser --quiet --system --group --no-create-home --home $CDIR $NAME + + for x in $CDIR $LDIR ; do + if [ ! -d "$x" ]; then + install -d -g $NAME -o $NAME -m2755 "$x" + fi + done + + db_get apt-cacher-ng/modifytargets || true + + if [ "$RET" = "true" ] ; then + + db_get apt-cacher-ng/gentargetmode || true + + case "$RET" in + "Create once") + reset_lists + gen_lists + db_set apt-cacher-ng/modifytargets false + ;; + "Create now and update later") + reset_lists + gen_lists + ;; + "Disable target rerouting") + reset_lists + db_set apt-cacher-ng/modifytargets false + ;; + esac + fi + + db_stop || true + + rm -f $CFG/in.acng $CFG/mount.acng + + if [ -z "$(dpkg-statoverride --list $CFG/security.conf)" ] ; then + dpkg-statoverride --update --add apt-cacher-ng apt-cacher-ng 600 $CFG/security.conf + fi +fi + +#DEBHELPER# --- apt-cacher-ng-0.4.orig/debian/apt-cacher-ng.postrm +++ apt-cacher-ng-0.4/debian/apt-cacher-ng.postrm @@ -0,0 +1,23 @@ +#!/bin/sh -e + +NAME=apt-cacher-ng +CDIR=/var/cache/$NAME +LDIR=/var/log/$NAME + +if [ "$1" = "purge" ]; then + + rm -rf $CDIR + rm -f $LDIR/apt-cacher.err $LDIR/apt-cacher.log $LDIR/apt-cacher.log.* $LDIR/maint_*.log + rmdir $LDIR || true + + dpkg-statoverride --remove /etc/apt-cacher-ng/security.conf 2>/dev/null || true + + if [ -x "$(command -v deluser)" -a -x "$(command -v delgroup)" ]; then + deluser --quiet --system $NAME || true + delgroup --quiet --system $NAME || true + else + echo "Not removing apt-cacher-ng user and group: adduser package not found." >&2 + fi +fi + +#DEBHELPER# --- apt-cacher-ng-0.4.orig/debian/apt-cacher-ng.templates +++ apt-cacher-ng-0.4/debian/apt-cacher-ng.templates @@ -0,0 +1,20 @@ +Template: apt-cacher-ng/modifytargets +Type: boolean +Default: true +_Description: Configure apt-cacher-ng to transparently reroute requests to different mirrors? + Apt-cacher-ng can silently and transparently reroute user requests to + different mirror(s). To simplify required configuration this setup can create + or modify lists of target hosts. + +Template: apt-cacher-ng/gentargetmode +Type: select +_Choices: Create once, Create now and update later, Disable target rerouting +_Default: Create once +_Description: Configuration mode of download sources: + The lists of target mirrors (download sources) for popular distributions can + be created based on information in the current sources.list file. Optionally, + the lists can be updated to match sources.list on every later update of the + apt-cacher-ng package. + . + Alternatively, the target mirror rerouting can be disabled now by removing the + current targets from existing lists. --- apt-cacher-ng-0.4.orig/debian/changelog +++ apt-cacher-ng-0.4/debian/changelog @@ -0,0 +1,399 @@ +apt-cacher-ng (0.4-1) unstable; urgency=low + + * New upstream release + + Fixes thread leak due to race condition, based on patch + from Alexander Inyukhin (thanks, closes: #530440) + + -- Eduard Bloch Tue, 26 May 2009 00:03:20 +0200 + +apt-cacher-ng (0.3.12-1) unstable; urgency=low + + * New upstream release + + more reliable closing of file handles (might solve #529744) + + reveals origin of 40x HTTP errors to the user (for #530021) + * verbose Debconf configuration for automated backend setup which repeatedly + confused some users in the past (closes: #530021). Deprecates the + truncate-and-reconfigure trick. + + -- Eduard Bloch Mon, 25 May 2009 01:21:29 +0200 + +apt-cacher-ng (0.3.11-1) unstable; urgency=low + + * New upstream release + * Log file removal on purge (closes: #527378) + + -- Eduard Bloch Sat, 09 May 2009 19:50:34 +0200 + +apt-cacher-ng (0.3.10-1) unstable; urgency=high + + * New upstream release + + fixing a subtle change in 0.3.9 which breaks import function and might + cause cache damage for users who manually run expiration with data + checksumming (many thanks to Petra Ruebe-Pugliese, closes: #526956) + + -- Eduard Bloch Mon, 04 May 2009 23:02:41 +0200 + +apt-cacher-ng (0.3.9-1) unstable; urgency=medium + + * New upstream release + * Moved service disabling check to the correct place (closes: #523290) + + -- Eduard Bloch Tue, 21 Apr 2009 23:55:16 +0200 + +apt-cacher-ng (0.3.8-1) unstable; urgency=medium + + * New upstream release + * Fixed init script deactivation (closes: #522186) + + -- Eduard Bloch Sat, 04 Apr 2009 23:03:52 +0200 + +apt-cacher-ng (0.3.7-1) unstable; urgency=medium + + * New upstream release + + fixes debian-volatile confusion, updated the mirror list (closes: #522239) + + added some documentation and a documentation reference to the error + messages for the busy port condition (closes: #522178) + * mirror picker improvements: considering ftp sources correctly, removing + duplicate lines in backend files + * added support for the init script deactivation with an environment + variable (closes: #522186) + + -- Eduard Bloch Fri, 03 Apr 2009 22:53:25 +0200 + +apt-cacher-ng (0.3.6-1) unstable; urgency=low + + * New upstream release with minor speedups + * Fixed new bashisms in the init script (closes: #521465) + + -- Eduard Bloch Fri, 27 Mar 2009 22:26:18 +0100 + +apt-cacher-ng (0.3.5-2) unstable; urgency=low + + * Added ftp: as possible pattern when looking for good mirrors in + sources.list for backend definition creation (now really closes: #520824) + + -- Eduard Bloch Thu, 26 Mar 2009 23:59:36 +0100 + +apt-cacher-ng (0.3.5-1) unstable; urgency=low + + * New upstream release + + adds hostname to DNS error messages in the expiration output, to help + users who do not read config files, documentation or logfiles like + apt-cacher.err (closes: #520824) + * init script fixes: checking the running state before overwritting the PID + file, attempt to terminate harder on stop command when PID file is lost. + Also fixes path name of the PID removed in the stop action (closes: #520565). + + -- Eduard Bloch Thu, 26 Mar 2009 22:51:38 +0100 + +apt-cacher-ng (0.3.4-1) unstable; urgency=low + + * New upstream version + * Added perl to Recommends (for the still optional expiration task), added + hints to error log when the script startup is impossible (closes: #508794) + * documents how to remove entire distribution releases and adds a helper + script (closes: #516686) + * expiration adds server-reported file size verification (closes: #511567) + * restructured the manual to be more user oriented, including many + ideas and proposals from Andras Korn (thanks, closes: #515194) + + -- Eduard Bloch Tue, 10 Mar 2009 22:59:44 +0100 + +apt-cacher-ng (0.3.3-1) unstable; urgency=low + + * logrotate called kill convention fix for Dash lovers (closes: 506958) + + -- Eduard Bloch Thu, 27 Nov 2008 11:30:39 +0100 + +apt-cacher-ng (0.3.2-2) unstable; urgency=low + + * GCC 4.4 related fixes (closes: #505385) + * automatic cropping of V4-in-V6 addresses to IPv4 format in user info pages + (closes: #502564) + + -- Eduard Bloch Mon, 17 Nov 2008 19:44:16 +0100 + +apt-cacher-ng (0.3.2-1) unstable; urgency=low + + * New upstream version, fixes startup problem with numeric command line + options, based on patch from Theppitak Karoonboonyanan (closes: #502072) + + -- Eduard Bloch Mon, 13 Oct 2008 21:14:11 +0200 + +apt-cacher-ng (0.3.1-1) unstable; urgency=low + + * New upstream version, fixing minor problems + + -- Eduard Bloch Sun, 12 Oct 2008 13:39:26 +0200 + +apt-cacher-ng (0.3-1) unstable; urgency=low + + * New upstream version + + more careful cleanup after connection errors (closes: #499539) + + option to force redownload of volatile files (closes: #497766) + + -- Eduard Bloch Tue, 23 Sep 2008 00:21:53 +0200 + +apt-cacher-ng (0.2.9-1) unstable; urgency=high + + * Minor upstream release (bugfix for changes in 0.2.8) + Should now really be the last release for the next weeks... + + -- Eduard Bloch Thu, 04 Sep 2008 04:22:55 +0200 + +apt-cacher-ng (0.2.8-1) unstable; urgency=high + + * New upstream (bugfix) release + + fixes reconnection on timeout or end of KeepAlive sequence(closes:#497700) + + -- Eduard Bloch Wed, 03 Sep 2008 20:21:45 +0200 + +apt-cacher-ng (0.2.7-1) unstable; urgency=high + + * New usptream release + + fixes infinite loop on bad host resolution in some configurations + (closes: #497567) + + suppress some protocol warnings (i.e. with disabled IPv6 configuration, + closes: #497554) + + addresses another potential file corruption problem + + -- Eduard Bloch Wed, 03 Sep 2008 15:30:28 +0200 + +apt-cacher-ng (0.2.6-1) unstable; urgency=high + + * New upstream release + + expected to fix incorrect storage of cached files (closes: #495350) + + expected to solve "hanging" problem after stalls in the download queue + processing (closes: #496937) + + -- Eduard Bloch Sat, 30 Aug 2008 00:58:22 +0200 + +apt-cacher-ng (0.2.5-2) unstable; urgency=medium + + * Fixes seeking in the cache file within sendfile(2) emulation, + based on patch from Jiří Paleček (closes: #495345) + + -- Eduard Bloch Sat, 16 Aug 2008 14:48:35 +0200 + +apt-cacher-ng (0.2.5-1) unstable; urgency=high + + * New upstream (bugfix) release + + -- Eduard Bloch Sun, 10 Aug 2008 23:03:15 +0200 + +apt-cacher-ng (0.2.4-1) unstable; urgency=high + + * New upstream version + + expiration.cc: typo fix, restores parsing of Release files; cache might + be damaged when running expiration with 0.2.3 version(s) + + -- Eduard Bloch Sun, 03 Aug 2008 21:11:15 +0200 + +apt-cacher-ng (0.2.3-3) unstable; urgency=medium + + * checkenv.sh fixes for dash's bugs with echo (#379227) and shift + return code, closes: #493455 + * minor documentation fix on command call example for acngfs + * added one missing HTML page to documentation + + -- Eduard Bloch Sun, 03 Aug 2008 15:23:22 +0200 + +apt-cacher-ng (0.2.3-2) unstable; urgency=medium + + * Check existence of the expiration start tool in cron.daily to avoid spam + after simple package removal (closes: 493333) + * debian/rules: made use of CXXFLAGS more reliable + + -- Eduard Bloch Sat, 02 Aug 2008 10:45:24 +0200 + +apt-cacher-ng (0.2.3-1) unstable; urgency=low + + * New upstream release + + adds option for faster log line buffer flushing (closes: 489713) + * copyright file update + + -- Eduard Bloch Sun, 27 Jul 2008 21:25:19 +0200 + +apt-cacher-ng (0.2.2-2) unstable; urgency=low + + * Build for Sid + + -- Eduard Bloch Mon, 21 Jul 2008 20:30:18 +0200 + +apt-cacher-ng (0.2.2-1) experimental; urgency=medium + + * New upstream release fixing a bunch of nasty problems + + -- Eduard Bloch Thu, 17 Jul 2008 23:35:18 +0200 + +apt-cacher-ng (0.2.1-1) unstable; urgency=medium + + * New upstream release + + might fix incorrect responses on server changing (apt's "hang-up") + + -- Eduard Bloch Sat, 28 Jun 2008 17:27:12 +0200 + +apt-cacher-ng (0.2-1) unstable; urgency=low + + * New upstream release + * Installing acngfs again + + -- Eduard Bloch Sat, 28 Jun 2008 17:16:04 +0200 + +apt-cacher-ng (0.2~pre3-1) experimental; urgency=low + + * New upstream preview release (important bugfixes) + * Logrotate integration + * cron.daily script for non-interactive expiration (already in the + last revision) + + -- Eduard Bloch Wed, 25 Jun 2008 00:37:23 +0200 + +apt-cacher-ng (0.2~pre2-1) experimental; urgency=low + + * New upstream preview release + + -- Eduard Bloch Tue, 24 Jun 2008 00:58:16 +0200 + +apt-cacher-ng (0.2~pre1-1) experimental; urgency=low + + * New upstream preview release + + adds more local Ubuntu mirrors (closes: #477044) + + fixes/improves connection and thread management (closes:#475583, #458782) + + dropped bogus path check on symlink import (closes: #484760) + + -- Eduard Bloch Tue, 17 Jun 2008 00:04:24 +0200 + +apt-cacher-ng (0.1.13-1) unstable; urgency=low + + * New upstream release + + stop applying URL filename decoding when inappropriate (closes: #475782) + * Considering sources.list.d/* when guessing preferred mirror and refactored + postinst code, catching some corner cases (closes: #471811) + + -- Eduard Bloch Sun, 13 Apr 2008 22:43:44 +0200 + +apt-cacher-ng (0.1.12-2) unstable; urgency=low + + * Fixate/Remove permissions with dpkg-statoverride, fixing FTBFS from + #471674 changes + * Postinst now considers ftp hosts as preferred mirrors (closes: #471809), + also documented some Debian specific bits about backends files + (re)generation in README.Debian + + -- Eduard Bloch Thu, 20 Mar 2008 12:45:13 +0100 + +apt-cacher-ng (0.1.12-1) unstable; urgency=low + + * New upstream release with minor bugfix + * Fixes permissions of security.conf for the apt-cacher-ng user and + group (closes: #471674) + + -- Eduard Bloch Thu, 20 Mar 2008 02:44:05 +0100 + +apt-cacher-ng (0.1.11-1) unstable; urgency=low + + * New upstream release + + includes patch from Jiří Paleček to fix EINTR handling and other fixes + for similar issues (closes: #471110) + + basic auth support for admin tasks + + improved guessing of index file locations on import + * removed symlinks for unrelated files from /etc + + -- Eduard Bloch Wed, 19 Mar 2008 00:34:10 +0100 + +apt-cacher-ng (0.1.10-1) unstable; urgency=low + + * New upstream version (mostly bugfixes) + + adds simple URL support in rewrite lists (closes: #461622), thanks + to Tobias Gruetzmacher + + -- Eduard Bloch Thu, 07 Feb 2008 23:38:30 +0100 + +apt-cacher-ng (0.1.9-1) unstable; urgency=medium + + * New upstream version fixing some obscure bugs + + -- Eduard Bloch Tue, 11 Dec 2007 21:08:31 +0100 + +apt-cacher-ng (0.1.8-1) unstable; urgency=low + + * New upstream version + * Added pkg-config dependency + + -- Eduard Bloch Thu, 06 Dec 2007 23:14:26 +0100 + +apt-cacher-ng (0.1.7-1) unstable; urgency=medium + + * New upstream version + + includes an experimental http filesystem + + no longer using "identity" Transfer-Encoding, d-i's wget was confused + * No longer using variables from vars.sh -> remove it (closes: #452928) + + -- Eduard Bloch Sun, 02 Dec 2007 23:46:03 +0100 + +apt-cacher-ng (0.1.6-1) unstable; urgency=low + + * New bugfix release + + -- Eduard Bloch Sun, 18 Nov 2007 21:05:31 +0100 + +apt-cacher-ng (0.1.5-1) unstable; urgency=low + + * New feature release + + -- Eduard Bloch Sun, 18 Nov 2007 21:04:22 +0100 + +apt-cacher-ng (0.1.4-1) unstable; urgency=medium + + * New bugfix release + + -- Eduard Bloch Sun, 18 Nov 2007 02:45:54 +0100 + +apt-cacher-ng (0.1.3-1) unstable; urgency=medium + + * New "upstream" release, fixes problem with potentially wrong file + locations in the local cache + + -- Eduard Bloch Sat, 17 Nov 2007 16:36:40 +0100 + +apt-cacher-ng (0.1.2-1) unstable; urgency=low + + * Fix of the fix: using correct peer name buffer (i.e. in log printing) + + -- Eduard Bloch Fri, 16 Nov 2007 22:00:00 +0100 + +apt-cacher-ng (0.1.1-1) unstable; urgency=low + + * New "upstream" version + + Fixes problem with double bind without IPV6_ONLY (closes: #451412) + * Package descriptions fixes (closes: #451342) + + -- Eduard Bloch Fri, 16 Nov 2007 02:25:00 +0100 + +apt-cacher-ng (0.1-2) unstable; urgency=low + + * Corrects hanging grep command in postinst happening during initial + installation (closes: #451279) + + -- Eduard Bloch Wed, 14 Nov 2007 21:36:56 +0100 + +apt-cacher-ng (0.1-1) unstable; urgency=low + + * New "upsteam" version, includes manpage and inetd client + * First upload to Unstable + + -- Eduard Bloch Wed, 14 Nov 2007 01:36:36 +0100 + +apt-cacher-ng (0.0.10-1) experimental; urgency=low + + * New version with minor fixes and feature enhancements + + -- Eduard Bloch Fri, 09 Nov 2007 00:40:45 +0100 + +apt-cacher-ng (0.0.9-1) experimental; urgency=low + + * Initial release (Closes: #447514), going to experimental for first testing + + -- Eduard Bloch Thu, 01 Nov 2007 18:22:27 +0100 + --- apt-cacher-ng-0.4.orig/debian/compat +++ apt-cacher-ng-0.4/debian/compat @@ -0,0 +1 @@ +5 --- apt-cacher-ng-0.4.orig/debian/control +++ apt-cacher-ng-0.4/debian/control @@ -0,0 +1,28 @@ +Source: apt-cacher-ng +Section: net +Priority: optional +Maintainer: Eduard Bloch +Build-Depends: debhelper (>= 5), libbz2-dev, zlib1g-dev, libfuse-dev, pkg-config +Standards-Version: 3.8.1 + +Package: apt-cacher-ng +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser +Recommends: perl (>> 5.8), ed +Description: Caching proxy for distribution of software packages + Apt-Cacher NG is yet another implementation of a HTTP proxy for + software packages, primarily targeted at Debian/Ubuntu packages but + may also be used with others types. + . + It follows similar principles as others (Apt-Cacher, Apt-Proxy, + Approx) and serves the same purpose: a central machine presents the + proxy for a local network and clients configure their APT setup + to download through it. Apt-Cacher keeps a copy of all useful data + that has been passed through it and when a similar request appears, + the old copy of the data is delivered without redownloading it from + the Debian mirrors. + . + Apt-Cacher NG is more than a simple rewrite of Apt-Cacher. It was redesigned + from scratch and is written in C++ with main focus on maximizing throughput + with low requirements on system resources. + --- apt-cacher-ng-0.4.orig/debian/copyright +++ apt-cacher-ng-0.4/debian/copyright @@ -0,0 +1,154 @@ +This package was debianized by Eduard Bloch on +Sun, 21 Oct 2007 20:15:48 +0200. + +It can be downloaded from http://www.unix-ag.uni-kl.de/~bloch/acng/. + +Upstream Author: + +Eduard Bloch + +Copyright: + +apt-cacher-ng: (C) 2006-2007 Eduard Bloch +md5 add-on: (C) 1999, 2000, 2002 Aladdin Enterprises. All rights reserved. + +License: + +The source files in this package are provided for use and distribution under +the terms listed under I unless specified otherwise in the beginning of the +particular file. The package includes md5 checksumming implementation provided +under the terms listed under II, getaddrinfo/freeaddrinfo/getnameinfo emulation +code released under the terms listed under III, and sha1 implementation +released under the terms listed under IV. + +I. Apt-Cacher NG + +Copyright (c) 2007 Eduard Bloch. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software must + display the following acknowledgement: "This product includes software + developed by Eduard Bloch." +4. Neither the name of Eduard Bloch nor the names of other contributors may be + used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +II. MD5 implementation + +/* + Copyright (C) 1999, 2002 Aladdin Enterprises. All rights reserved. + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + L. Peter Deutsch + ghost@aladdin.com + + */ + +III. + +// $Id: rfc2553emu.cc,v 1.8 2001/02/20 07:03:18 jgg Exp $ +/* ###################################################################### + + RFC 2553 Emulation - Provides emulation for RFC 2553 getaddrinfo, + freeaddrinfo and getnameinfo + + This is really C code, it just has a .cc extensions to play nicer with + the rest of APT. + + Originally written by Jason Gunthorpe and placed into + the Public Domain, do with it what you will. + + ##################################################################### */ + +IV. + +/* (PD) 2006 The Bitzi Corporation + * + * 1. Authorship. This work and others bearing the above + * label were created by, or on behalf of, the Bitzi + * Corporation. Often other public domain material by + * other authors is incorporated; this should be clear + * from notations in the source code. If other non- + * public-domain code or libraries are included, this is + * is done under those works' respective licenses. + * + * 2. Release. The Bitzi Corporation places its portion + * of these labelled works into the public domain, + * disclaiming all rights granted us by copyright law. + * + * Bitzi places no restrictions on your freedom to copy, + * use, redistribute and modify this work, though you + * should be aware of points (3), (4), and (5) below. + * + * 3. Trademark Advisory. The Bitzi Corporation reserves + * all rights with regard to any of its trademarks which + * may appear herein, such as "Bitzi", "Bitcollider", or + * "Bitpedia". Please take care that your uses of this + * work do not infringe on our trademarks or imply our + * endorsement. For example, you should change labels + * and identifier strings in your derivative works where + * appropriate. + * + * 4. Licensed portions. Some code and libraries may be + * incorporated in this work in accordance with the + * licenses offered by their respective rightsholders. + * Further copying, use, redistribution and modification + * of these third-party portions remains subject to + * their original licenses. + * + * 5. Disclaimer. THIS SOFTWARE IS PROVIDED BY THE AUTHOR + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Please see http://bitzi.com/publicdomain or write + * info@bitzi.com for more info. + */ + +The Debian packaging is (C) 2007, Eduard Bloch and +is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'. + --- apt-cacher-ng-0.4.orig/debian/dirs +++ apt-cacher-ng-0.4/debian/dirs @@ -0,0 +1,3 @@ +usr/sbin +etc/apt-cacher-ng +usr/lib/apt-cacher-ng --- apt-cacher-ng-0.4.orig/debian/docs +++ apt-cacher-ng-0.4/debian/docs @@ -0,0 +1,4 @@ +TODO +doc/README +doc/*.pdf +doc/html/ --- apt-cacher-ng-0.4.orig/debian/rules +++ apt-cacher-ng-0.4/debian/rules @@ -0,0 +1,105 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 + +SHELL=/bin/bash +CDIR=$(CURDIR)/debian/apt-cacher-ng/etc/apt-cacher-ng/ + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +CXXFLAGS=$(CFLAGS) +export CXXFLAGS + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + $(MAKE) all + # may fail if halibut is not installed, doesn't matter + -$(MAKE) doc + #docbook-to-man debian/apt-cacher-ng.sgml > apt-cacher-ng.1 + + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + $(MAKE) distclean || true + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/apt-cacher-ng. + #$(MAKE) DESTDIR=$(CURDIR)/debian/apt-cacher-ng install + install apt-cacher-ng $(CURDIR)/debian/apt-cacher-ng/usr/sbin/apt-cacher-ng + #install acngfs $(CURDIR)/debian/apt-cacher-ng/usr/sbin/ + install acngfs in.acng expire-caller.pl distkill.pl $(CURDIR)/debian/apt-cacher-ng/usr/lib/apt-cacher-ng/ + cp -a conf/{*mirror*,*.html,*.css} $(CURDIR)/debian/apt-cacher-ng/usr/lib/apt-cacher-ng + cp -a conf/*.conf $(CDIR) + > $(CDIR)/backends_debian + > $(CDIR)/backends_debvol + > $(CDIR)/backends_ubuntu + cd $(CDIR) && cp -s ../../usr/lib/apt-cacher-ng/{*mirror*,*.html,*.css} . + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples conf/*.conf +# dh_install +# dh_installmenu + dh_installdebconf + dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_python + dh_installinit + dh_installcron +# dh_installinfo + dh_installman doc/man/*.8 + #dh_installman doc/man/apt-cacher-ng.8 + dh_link + dh_strip + dh_compress -X.pdf + dh_fixperms +# dh_perl +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- apt-cacher-ng-0.4.orig/debian/po/POTFILES.in +++ apt-cacher-ng-0.4/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] apt-cacher-ng.templates --- apt-cacher-ng-0.4.orig/debian/po/de.po +++ apt-cacher-ng-0.4/debian/po/de.po @@ -0,0 +1,65 @@ +msgid "" +msgstr "" +"Project-Id-Version: apt-cacher-ng\n" +"Report-Msgid-Bugs-To: apt-cacher-ng@packages.debian.org\n" +"POT-Creation-Date: 2009-05-24 23:49+0200\n" +"PO-Revision-Date: \n" +"Last-Translator: Eduard Bloch \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: German\n" +"X-Poedit-Country: GERMANY\n" +"X-Poedit-SourceCharset: utf-8\n" + +#. Type: boolean +#. Description +#: ../apt-cacher-ng.templates:1001 +#| msgid "Automatic configuration of download targets" +msgid "Automatic configuration of download sources" +msgstr "Automatische Konfiguration der Download-Quellen:" + +#. Type: boolean +#. Description +#: ../apt-cacher-ng.templates:1001 +msgid "Apt-cacher-ng can silently and transparently reroute user requests to different mirror(s). To simplify required configuration this setup can create or modify lists of target hosts." +msgstr "Apt-cacher-ng kann stillschweigend und transparent die Aufrufe der Benutzer auf andere Archiv-Spiegel umleiten. Um die entsprechende Konfiguration zu vereinfachen, kann dieser Konfigurator die Listen der Ziel-Spiegel verwalten." + +#. Type: boolean +#. Description +#: ../apt-cacher-ng.templates:1001 +msgid "Configure apt-cacher-ng to transparently reroute requests to different mirrors?" +msgstr "Soll apt-cacher-ng für die Download-Umleitung auf andere Spiegel konfiguriert werden?" + +#. Type: select +#. Choices +#: ../apt-cacher-ng.templates:2001 +msgid "Create once, Create now and update later, Disable target rerouting" +msgstr "Nur ein Mal erstellen, Jetzt erstellen und später aktualisieren, Download-Umleitung ausschalten" + +#. Type: select +#. Default +#: ../apt-cacher-ng.templates:2002 +msgid "Create once" +msgstr "Nur ein Mal erstellen" + +#. Type: select +#. Description +#: ../apt-cacher-ng.templates:2003 +#| msgid "Automatic configuration of download targets" +msgid "Configuration mode of download sources:" +msgstr "Art der Downloadquellen-Konfiguration:" + +#. Type: select +#. Description +#: ../apt-cacher-ng.templates:2003 +msgid "The lists of target mirrors (download sources) for popular distributions can be created based on information in the current sources.list file. Optionally, the lists can be updated to match sources.list on every later update of the apt-cacher-ng package." +msgstr "Die Listen der Ziel-Server (Download-Quellen) für beliebte Distributionen kann basierend auf der derzeitigen sources.list-Datei erzeugt werden. Außerdem kann diese Liste bei späteren Aktualisierungen des apt-cacher-ng-Pakets automatisch auf den neusten Stand von sources.list gebracht werden." + +#. Type: select +#. Description +#: ../apt-cacher-ng.templates:2003 +msgid "Alternatively, the target mirror rerouting can be disabled now by removing the current targets from existing lists." +msgstr "Alternativ kann die Download-Umleitung komplett ausgeschaltet werden, durch Entfernung sämtlicher Alternativ-Ziele aus den Listen." + --- apt-cacher-ng-0.4.orig/debian/po/templates.pot +++ apt-cacher-ng-0.4/debian/po/templates.pot @@ -0,0 +1,76 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: apt-cacher-ng@packages.debian.org\n" +"POT-Creation-Date: 2009-05-24 23:49+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../apt-cacher-ng.templates:1001 +msgid "Automatic configuration of download sources" +msgstr "" + +#. Type: boolean +#. Description +#: ../apt-cacher-ng.templates:1001 +msgid "" +"Apt-cacher-ng can silently and transparently reroute user requests to " +"different mirror(s). To simplify required configuration this setup can " +"create or modify lists of target hosts." +msgstr "" + +#. Type: boolean +#. Description +#: ../apt-cacher-ng.templates:1001 +msgid "" +"Configure apt-cacher-ng to transparently reroute requests to different " +"mirrors?" +msgstr "" + +#. Type: select +#. Choices +#: ../apt-cacher-ng.templates:2001 +msgid "Create once, Create now and update later, Disable target rerouting" +msgstr "" + +#. Type: select +#. Default +#: ../apt-cacher-ng.templates:2002 +msgid "Create once" +msgstr "" + +#. Type: select +#. Description +#: ../apt-cacher-ng.templates:2003 +msgid "Configuration mode of download sources:" +msgstr "" + +#. Type: select +#. Description +#: ../apt-cacher-ng.templates:2003 +msgid "" +"The lists of target mirrors (download sources) for popular distributions can " +"be created based on information in the current sources.list file. " +"Optionally, the lists can be updated to match sources.list on every later " +"update of the apt-cacher-ng package." +msgstr "" + +#. Type: select +#. Description +#: ../apt-cacher-ng.templates:2003 +msgid "" +"Alternatively, the target mirror rerouting can be disabled now by removing " +"the current targets from existing lists." +msgstr ""