summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apt-pkg/acquire-item.cc13
-rw-r--r--apt-pkg/contrib/cmndline.h7
-rw-r--r--apt-pkg/contrib/md5.cc19
-rw-r--r--buildlib/config.h.in4
-rw-r--r--configure.in41
-rw-r--r--debian/changelog2
-rw-r--r--doc/apt-cache.8.yo18
-rw-r--r--doc/apt-cdrom.8.yo10
-rw-r--r--doc/apt-get.8.yo35
-rw-r--r--doc/examples/apt.conf3
10 files changed, 91 insertions, 61 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 2bae109fd..ddaf260ea 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: acquire-item.cc,v 1.39 1999/10/17 20:58:36 jgg Exp $
+// $Id: acquire-item.cc,v 1.40 1999/10/31 06:32:27 jgg Exp $
/* ######################################################################
Acquire Item - Item to acquire
@@ -638,9 +638,18 @@ void pkgAcqFile::Done(string Message,unsigned long Size,string MD5)
return;
}
+ // Erase the file if it is a symlink so we can overwrite it
+ struct stat St;
+ if (lstat(DestFile.c_str(),&St) == 0)
+ {
+ if (S_ISLNK(St.st_mode) != 0)
+ unlink(DestFile.c_str());
+ }
+
+ // Symlink the file
if (symlink(FileName.c_str(),DestFile.c_str()) != 0)
{
- ErrorText = "Link to " + DestFile + "failure ";
+ ErrorText = "Link to " + DestFile + " failure ";
Status = StatError;
Complete = false;
}
diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h
index e611cd637..8f461296f 100644
--- a/apt-pkg/contrib/cmndline.h
+++ b/apt-pkg/contrib/cmndline.h
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: cmndline.h,v 1.6 1999/01/18 06:20:07 jgg Exp $
+// $Id: cmndline.h,v 1.7 1999/10/31 06:32:28 jgg Exp $
/* ######################################################################
Command Line Class - Sophisticated command line parser
@@ -17,7 +17,7 @@
CommandLine::Args Args[] =
{{'q',"quiet","apt::get::quiet",CommandLine::IntLevel},
- {0,0,0,0,0}};
+ {0,0,0,0}};
The flags mean,
HasArg - Means the argument has a value
@@ -34,6 +34,9 @@
ConfigFile - Means this flag should be interprited as the name of
a config file to read in at this point in option processing.
Implies HasArg.
+ ArbItem - Means the item is an arbitary configuration string of
+ the form item=value, where item is passed directly
+ to the configuration class.
The default, if the flags are 0 is to use Boolean
##################################################################### */
diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index 381c38753..2beaa1204 100644
--- a/apt-pkg/contrib/md5.cc
+++ b/apt-pkg/contrib/md5.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: md5.cc,v 1.5 1999/10/25 04:10:02 jgg Exp $
+// $Id: md5.cc,v 1.6 1999/10/31 06:32:28 jgg Exp $
/* ######################################################################
MD5Sum - MD5 Message Digest Algorithm.
@@ -52,14 +52,21 @@
// byteSwap - Swap bytes in a buffer /*{{{*/
// ---------------------------------------------------------------------
/* Swap n 32 bit longs in given buffer */
-inline static void byteSwap(uint32_t *buf, unsigned words)
+#ifdef WORDS_BIGENDIAN
+static void byteSwap(uint8_t *buf, unsigned words)
{
- do
+ uint8_t *p = (uint8_t *)buf;
+
+ do
{
- *buf++ = htonl(*buf);
- }
- while (--words);
+ *buf++ = (UINT32)((unsigned)p[3] << 8 | p[2]) << 16 |
+ ((unsigned)p[1] << 8 | p[0]);
+ p += 4;
+ } while (--words);
}
+#else
+#define byteSwap(buf,words)
+#endif
/*}}}*/
// MD5Transform - Alters an existing MD5 hash /*{{{*/
// ---------------------------------------------------------------------
diff --git a/buildlib/config.h.in b/buildlib/config.h.in
index c6b097ca8..f882ca25d 100644
--- a/buildlib/config.h.in
+++ b/buildlib/config.h.in
@@ -1,3 +1,7 @@
+/* Define if your processor stores words with the most significant
+ byte first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
+
/* The number of bytes in a usigned char. */
#undef SIZEOF_CHAR
diff --git a/configure.in b/configure.in
index 1525e961b..8e052ed49 100644
--- a/configure.in
+++ b/configure.in
@@ -83,35 +83,36 @@ AC_CACHE_CHECK([for C9x integer types],c9x_ints,[
[uint8_t Foo1;uint16_t Foo2;uint32_t Foo3;uint64_t Foo],
c9x_ints=yes,c9x_ints=no)])
-dnl We do not need this if we have inttypes..
- if test x"$c9x_ints" = x"no"; then
- dnl Check the sizes etc. of the architecture
- changequote(,)
- if archline="`sed -ne 's/^'$archset':[ ]\+\(.*\)/\1/gp' $srcdir/buildlib/sizetable`"; then
- changequote([,])
- set $archline
- if test "$1" = "little"; then
- ac_cv_c_bigendian=no
- else
- ac_cv_c_bigendian=yes
- fi
- size_char=$2
- size_int=$3
- size_short=$4
- size_long=$5
+dnl Check the sizes etc. of the architecture
+changequote(,)
+if archline="`sed -ne 's/^'$archset':[ ]\+\(.*\)/\1/gp' $srcdir/buildlib/sizetable`"; then
+ changequote([,])
+ set $archline
+ if test "$1" = "little"; then
+ ac_cv_c_bigendian=no
+ else
+ ac_cv_c_bigendian=yes
fi
+ size_char=$2
+ size_int=$3
+ size_short=$4
+ size_long=$5
+fi
- if test "$cross_compiling" = "yes" -a "$archline" = ""; then
- AC_MSG_ERROR(When cross compiling, architecture must be present in sizetable)
- fi
- AC_C_BIGENDIAN
+if test "$cross_compiling" = "yes" -a "$archline" = ""; then
+ AC_MSG_ERROR(When cross compiling, architecture must be present in sizetable)
+fi
+AC_C_BIGENDIAN
+dnl We do not need this if we have inttypes..
+if test x"$c9x_ints" = x"no"; then
AC_CHECK_SIZEOF(char,$size_char)
AC_CHECK_SIZEOF(int,$size_int)
AC_CHECK_SIZEOF(short,$size_short)
AC_CHECK_SIZEOF(long,$size_long)
fi
+
dnl Check for debiandoc
AC_CHECK_PROG(DEBIANDOC_HTML,debiandoc2html,"yes","")
AC_CHECK_PROG(DEBIANDOC_TEXT,debiandoc2text,"yes","")
diff --git a/debian/changelog b/debian/changelog
index db75e6f99..e49b40172 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ apt (0.3.13.1) unstable; urgency=low
* Slightly more accurate 'can not find package' message. Closes: #48311
* --trivial-only and --no-remove. Closes: #48518
* Increased the cache size. Closes: #47648
+ * Comment woopsie. Closes: #48789
+ * Removes existing links when linking sources. Closes: #48775
-- Jason Gunthorpe <jgg@debian.org> Fri, 3 Sep 1999 09:04:28 -0700
diff --git a/doc/apt-cache.8.yo b/doc/apt-cache.8.yo
index c75af9313..2100dd727 100644
--- a/doc/apt-cache.8.yo
+++ b/doc/apt-cache.8.yo
@@ -176,40 +176,40 @@ Show the program verison.
dit(bf(-p --pkg-cache))
Select the file to store the package cache. The package cache is the primary
cache used by all operations.
-See bf(Dir::Cache::pkgcache).
+Configuration Item: bf(Dir::Cache::pkgcache).
dit(bf(-s --src-cache))
Select the file to store the source cache. The source is used only by
bf(gencaches) and it stores a parsed version of the package information from
remote sources. When building the package cache the source cache is used
to advoid reparsing all of the package files.
-See bf(Dir::Cache::srcpkgcache).
+Configuration Item: bf(Dir::Cache::srcpkgcache).
dit(bf(-q, --quiet))
Quiet; produces output suitable for logging, omitting progress indicators.
More qs will produce more quite up to a maximum of 2. You can also use
bf(-q=#) to set the quiet level, overriding the configuration file.
-See bf(quiet).
+Configuration Item: bf(quiet).
dit(bf(-i --important))
Print only important deps; for use with unmet causes only em(Depends) and
em(Pre-Depends) relations to be printed.
-See bf(APT::Cache::Important).
+Configuration Item: bf(APT::Cache::Important).
dit(bf(-f --full))
-Print full package records when searching. See bf(APT::Cache::ShowFull).
+Print full package records when searching. Configuration Item: bf(APT::Cache::ShowFull).
dit(bf(-a --all-versions))
Print full records for all available versions, this is only applicable to the
-show command. See bf(APT::Cache::AllVersions)
+show command. Configuration Item: bf(APT::Cache::AllVersions)
dit(bf(-g --no-generate))
Do not perform automatic package cache regeneration, use the cache as it is.
-See bf(APT::Cache::NoGenerate).
+Configuration Item: bf(APT::Cache::NoGenerate).
dit(bf(--names-only))
-Only search on the package names, not the long description. See
-bf(APT::Cache::Names-Only).
+Only search on the package names, not the long description.
+Configuration Item: bf(APT::Cache::Names-Only).
dit(bf(-c, --config-file))
Configuration File; Specify a configuration file to use. bf(apt-get) will
diff --git a/doc/apt-cdrom.8.yo b/doc/apt-cdrom.8.yo
index f017a9e59..9d5b598a2 100644
--- a/doc/apt-cdrom.8.yo
+++ b/doc/apt-cdrom.8.yo
@@ -49,23 +49,23 @@ Show the program verison.
dit(bf(-d --cdrom))
Mount point; specify the location to mount the cdrom. This mount point must
be listed in bf(/etc/fstab) and propely configured.
-See bf(Acquire::cdrom::mount).
+Configuration Item: bf(Acquire::cdrom::mount).
dit(bf(-r --rename))
Rename a disc; change the label of a disk or override the disks given label.
This option will cause bf(apt-cdrom) to prompt for a new label
-See bf(APT::CDROM::Rename).
+Configuration Item: bf(APT::CDROM::Rename).
dit(bf(-m, --no-mount))
No mounting; prevent bf(apt-cdrom) from mounting and unmounting the mount
point.
-See bf(APT::CDROM::NoMount).
+Configuration Item: bf(APT::CDROM::NoMount).
dit(bf(-f, --fast))
Fast Copy; Assume the package files are valid and do not check every package.
This option should be used only if bf(apt-cdrom) has been run on this disc
before and did not detect any errors.
-See bf(APT::CDROM::Fast).
+Configuration Item: bf(APT::CDROM::Fast).
dit(bf(-a, --thorough))
Thorough Package Scan; This option may be needed with some old Debian 1.1/1.2
@@ -75,7 +75,7 @@ scan the CD but will pick them all up.
dit(bf(-n --just-print, --recon, --no-act))
No Changes; Do not change the sources.list and do not write package files.
Everything is still checked however.
-See bf(APT::CDROM::NoAct).
+Configuration Item: bf(APT::CDROM::NoAct).
dit(bf(-c, --config-file))
Configuration File; Specify a configuration file to use. bf(apt-get) will
diff --git a/doc/apt-get.8.yo b/doc/apt-get.8.yo
index 3266581f7..c5b8a7162 100644
--- a/doc/apt-get.8.yo
+++ b/doc/apt-get.8.yo
@@ -131,7 +131,7 @@ bf(--no-f), bf(-f=no) or several other variations.
startdit()
dit(bf(-d, --download-only))
Download only; package files are only retrieved, not unpacked or installed.
-See bf(APT::Get::Download-Only).
+Configuration Item: bf(APT::Get::Download-Only).
dit(bf(-f, --fix-broken))
Fix; attempt to correct a system with broken dependencies in
@@ -142,7 +142,7 @@ exist on a system. It is possible that a system's dependency structure
can be so corrupt as to require manual intervention (which usually
means using dselect or dpkg --remove to eliminate some of the offending
packages). Use of this option together with -m may produce an error in
-some situations. See bf(APT::Get::Fix-Broken).
+some situations. Configuration Item: bf(APT::Get::Fix-Broken).
dit(bf(-h, --help))
Help; display a helpful usage message and exits.
@@ -154,7 +154,7 @@ dit(bf(-m, --ignore-missing, --fix-missing))
Ignore missing packages; If packages cannot be retrieved or fail the
integrity check after retrieval (corrupted package files), hold back
those packages and handle the result. Use of this option together with
--f may produce an error in some situations. See bf(ignore-missing).
+-f may produce an error in some situations. Configuration Item: bf(ignore-missing).
dit(bf(--no-download))
Disables downloading of packages. This is best used with --ignore-missing to
@@ -167,11 +167,13 @@ bf(-q=#) to set the quiet level, overriding the configuration file. Note that
quiet level 2 implies -y, you should never use -qq without a no-action
modifier such as -d, --print-uris or -s as APT may decided to do something
you did not expect.
-See bf(quiet)
+Configuration Item: bf(quiet)
dit(bf(-s, --simulate, --just-print, --dry-run, --recon, --no-act))
No action; perform a simulation of events that would occur but do not
-actually change the system. See bf(APT::Get::Simulate). Simulate prints out
+actually change the system. Configuration Item: bf(APT::Get::Simulate).
+
+Simulate prints out
a series of lines each one representing a dpkg operation, Configure (Conf),
Remove (Remv), Unpack (Inst). Square brackets indicate broken packages with
and empty set of square brackets meaning breaks that are of no consequence
@@ -181,11 +183,11 @@ dit(bf(-y, --yes, --assume-yes))
Automatic yes to prompts; assume "yes" as answer to all prompts and run
non-interactively. If an undesirable situation, such as changing a held
package or removing an essential package occurs then bf(apt-get) will
-abort. See bf(APT::Get::Assume-Yes).
+abort. Configuration Item: bf(APT::Get::Assume-Yes).
dit(bf(-u, --show-upgraded))
Show upgraded packages; Print out a list of all packages that are to be
-upgraded. See bf(APT::Get::Show-Upgraded).
+upgraded. Configuration Item: bf(APT::Get::Show-Upgraded).
dit(bf(-b, --compile, --build))
Compile source packages after downloading them.
@@ -193,25 +195,25 @@ Compile source packages after downloading them.
dit(bf(--ignore-hold))
Ignore package Holds; This causes bf(apt-get) to ignore a hold placed on
a package. This may be useful in conjunction with bf(dist-upgrade) to
-override a large number of undesired holds. See bf(APT::Ignore-Hold).
+override a large number of undesired holds. Configuration Item: bf(APT::Ignore-Hold).
dit(bf(--no-upgrade))
Do not upgrade packages; When used in conjunction with bf(install)
bf(no-upgrade) will prevent packages listed from being upgraded if they
-are already installed. See bf(APT::Get::no-upgrade).
+are already installed. Configuration Item: bf(APT::Get::no-upgrade).
dit(bf(--force-yes))
Force yes; This is a dangerous option that will cause apt to continue without
prompting if it is doing something potentially harmful. It should not be used
except in very special situations. Using bf(force-yes) can potentially destroy
-your system! See bf(APT::Get::force-yes).
+your system! Configuration Item: bf(APT::Get::force-yes).
dit(bf(--print-uris))
Instead of fetching the files to install their URIs are printed. Each
URI will have the path, the destination file name, the size and the expected
md5 hash. Note that the file name to write to will not always match
the file name on the remote site! This also works with the bf(source)
-command See bf(APT::Get::Print-URIs).
+command. Configuration Item: bf(APT::Get::Print-URIs).
dit(bf(--purge))
Use purge instead of remove for anything that would be removed.
@@ -223,20 +225,21 @@ dit(bf(--list-cleanup))
This option defaults to on, use bf(--no-list-cleanup) to turn it off.
When on apt-get will automatically manage the contents of
/var/state/apt/lists to ensure that obsolete files are erased. The only
-reason to turn it off is if you frequently change your source list. See
-bf(APT::Get::List-Cleanup)
+reason to turn it off is if you frequently change your source list.
+Configuration Item: bf(APT::Get::List-Cleanup)
dit(bf(--trivial-only))
Only perform operations are 'trivial'. Logically this can be considered
related to --assume-yes, where --assume-yes will answer yes to any prompt,
---trivial-only will answer no. See bf(APT::Get::Trivial-Only)
+--trivial-only will answer no. Configuration Item: bf(APT::Get::Trivial-Only)
dit(bf(--no-remove))
If any packages are to be removed apt-get immediately aborts without
-prompting. See bf(APT::Get::No-Remove)
+prompting. Configuration Item: bf(APT::Get::No-Remove)
dit(bf(--diff-only), bd(--tar-only))
-Download only the diff or tar file of a source archive.
+Download only the diff or tar file of a source archive.
+Configuration Item: bf(APT::Get::Diff-Only)
dit(bf(-c, --config-file))
Configuration File; Specify a configuration file to use. bf(apt-get) will
diff --git a/doc/examples/apt.conf b/doc/examples/apt.conf
index c6e506cb8..6bd04c5e5 100644
--- a/doc/examples/apt.conf
+++ b/doc/examples/apt.conf
@@ -1,4 +1,4 @@
-// $Id: apt.conf,v 1.41 1999/10/29 04:49:37 jgg Exp $
+// $Id: apt.conf,v 1.42 1999/10/31 06:32:28 jgg Exp $
/* This file is an index of all APT configuration directives. It should
NOT actually be used as a real config file, though it is a completely
valid file. Most of the options have sane default values, unless
@@ -78,6 +78,7 @@ Acquire
Proxy "http://127.0.0.1:3128";
Proxy::http.us.debian.org "DIRECT"; // Specific per-host setting
Timeout "120";
+ Pipeline-Depth "5";
// Cache Control. Note these do not work with Squid 2.0.2
No-Cache "false";
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 06:42:32 +0000