summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rwxr-xr-xdebian/postinst6
-rw-r--r--doc/examples/sources.list11
3 files changed, 14 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 77c34725a..5587d0ad9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,10 +10,12 @@ apt (0.3.11.1) unstable; urgency=low
* Sorts the output of any list. Closes: #41107
* Fixes the looping problem. Closes: #41784, #42414
* Fixes the CRC mechanism to lowercase all strings. Closes: #41839
- * More checks to keep the display sane. Closes: #42127
+ * More checks to keep the display sane. Particularly when fail-over is
+ used with local mirrors and CD-Roms. Closes: #42127, #43130
* PThread lockup problem on certain sparc/m68k. Closes: #40628
* apt-cdrom understands .gz Package files too. Closes: #42779
* Spelling error in dselect method description. Closes: #43251
+ * Added security to the default source list. Closes: #43356
-- Jason Gunthorpe <jgg@debian.org> Mon, 28 Jun 1999 21:06:44 -0700
diff --git a/debian/postinst b/debian/postinst
index d1b46d1a2..5b0e73b28 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -15,14 +15,14 @@ create_apt_conf ()
echo "/etc/apt/sources.list does not exist; creating a default setup."
cat > /etc/apt/sources.list <<EOF
-# Use for a local mirror - remove the ftp1 http lines for the bits
-# your mirror contains.
-# deb file:/your/mirror/here/debian stable main contrib non-free
# See sources.list(5) for more information, especialy
# Remember that you can only use http, ftp or file URIs
# CDROMs are managed throught the apt-cdrom tool.
+# Proxy configuration is covered through environment variables or
+#
deb http://http.us.debian.org/debian stable main contrib non-free
deb http://non-us.debian.org/debian-non-US stable non-US
+deb http://security.debian.org stable updates
EOF
}
diff --git a/doc/examples/sources.list b/doc/examples/sources.list
index 34de62161..4e7be3f7d 100644
--- a/doc/examples/sources.list
+++ b/doc/examples/sources.list
@@ -1,4 +1,9 @@
-# See sources.list(5) for more information
+# Use for a local mirror - remove the ftp1 http lines for the bits
+# your mirror contains.
+# deb file:/your/mirror/here/debian stable main contrib non-free
+# See sources.list(5) for more information, especialy
# Remember that you can only use http, ftp or file URIs
-deb http://ftp1.us.debian.org/debian unstable main contrib non-free
-deb http://non-us.debian.org/debian-non-US unstable non-US/main non-US/contrib non-US/non-free
+# CDROMs are managed throught the apt-cdrom tool.
+deb http://http.us.debian.org/debian stable main contrib non-free
+deb http://non-us.debian.org/debian-non-US stable non-US
+deb http://security.debian.org stable updates