Revert to using --force-yes, since --allow-unauthenticated doesn't work with sarge

  * Bug fix: "/usr/share/doc/pbuilder/examples/B90linda missing
    --force-yes option", thanks to qfunk (Closes: #340715).
    Note: --allow-unauthenticated is probably a better option here, but
    apt-get in sarge does not support it, we will revisit it after etch.

12 files changed, 34 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ec7a43..50dc1fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2005-12-04  Junichi Uekawa  <dancer@debian.org>
 
+	* debian/TODO: note TODO item.
+
+	* pdebuild-internal: Revert to use of --force-yes, since --allow-unauthenticated does not work in sarge
+	* pbuilder-updatebuildenv: 
+	* pbuilder-satisfydepends: 
+	* pbuilder-createbuildenv: 
+	* pbuilder-buildpackage-funcs: 
+	* examples/execute_installtest.sh:
+	* examples/B92test-pkg: 
+	* examples/B91dpkg-i:
+	* examples/B90linda: 
+
 	* pbuilder-createbuildenv: implement --no-targz for pbuilder create.
 
 	* pbuilder-buildpackage-funcs: #338976; SUTOUSER check is bogus.
diff --git a/debian/TODO b/debian/TODO
index 1390896..67f2873 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,5 +1,10 @@
 TODO and possible bugs: 
 
+* post-etch:
+   - support --allow-unauthenticated and package signiatures; #317998
+
+pbuilder support for signatures will hopefully come
+
 * xvfb:x11-common
    - debian-bug: 337541: fixed in 0.138
 /etc/init.d/x11-common needs to be ran; policy-rc.d is now patched.
diff --git a/debian/changelog b/debian/changelog
index b7ecea8..c5dc23d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,11 +5,9 @@ pbuilder (0.140) UNRELEASED; urgency=low
     BUILDUSERNAME isn't set", thanks to Mike Hommey (Closes: #341453).
   * pbuilder-doc.xml: Document ccache support in FAQ (Closes: #178350).
   * Bug fix: "/usr/share/doc/pbuilder/examples/B90linda missing
-    --allow-unauthenticated option", thanks to qfunk (Closes: #340715).
-  - fixed other scripts to use --allow-unauthenticated option rather than --force-yes.
-  
-  ... this breaks sarge chroots. We'll probably need to postpone this change to after etch release.
-  
+    --force-yes option", thanks to qfunk (Closes: #340715).
+    Note: --allow-unauthenticated is probably a better option here, but 
+    apt-get in sarge does not support it, we will revisit it after etch.
   * debconf compatibility level 4
   * Bug fix: "pbuilder-buildpackage-funcs check for createbuilduser for
     SUTOUSER is bogus", thanks to Brian Nelson (Closes: #338976).
diff --git a/examples/B90linda b/examples/B90linda
index a992a57..128d8f7 100644
--- a/examples/B90linda
+++ b/examples/B90linda
@@ -1,4 +1,4 @@
 #!/bin/bash
 # run linda on generated deb files
-apt-get install -y --allow-unauthenticated linda
+apt-get install -y --force-yes linda
 linda /tmp/buildd/*.deb
diff --git a/examples/B91dpkg-i b/examples/B91dpkg-i
index 63e5d11..ab7ebd7 100644
--- a/examples/B91dpkg-i
+++ b/examples/B91dpkg-i
@@ -16,11 +16,11 @@ dpkg -i /tmp/buildd/*.deb
 dpkg --purge $PKGNAMES
 
 # upgrade-remove check
-apt-get install -y --allow-unauthenticated  $PKGNAMES || true
+apt-get install -y --force-yes  $PKGNAMES || true
 dpkg -i /tmp/buildd/*.deb
 dpkg --remove $PKGNAMES
 
 # upgrade-purge check
-apt-get install -y --allow-unauthenticated $PKGNAMES || true
+apt-get install -y --force-yes $PKGNAMES || true
 dpkg -i /tmp/buildd/*.deb
 dpkg --purge $PKGNAMES
diff --git a/examples/B92test-pkg b/examples/B92test-pkg
index a678660..078e62f 100644
--- a/examples/B92test-pkg
+++ b/examples/B92test-pkg
@@ -5,7 +5,7 @@ set -e
 
 echo "Installing the prerequisites"
 for PKG in $(ls /tmp/buildd/*.deb | sed -e's,.*/,,;s,_.*,,' ); do
-    apt-get install -y  --allow-unauthenticated "$PKG"
+    apt-get install -y --force-yes "$PKG"
     apt-get remove -y "$PKG"
 done
 
diff --git a/examples/execute_installtest.sh b/examples/execute_installtest.sh
index 35b72b9..8159b1a 100755
--- a/examples/execute_installtest.sh
+++ b/examples/execute_installtest.sh
@@ -19,7 +19,7 @@ INSTALLTESTPID=$$
 ( sleep 1h ; kill $INSTALLTESTPID ) &
 KILLPID=$!
 
-apt-get install  -y --allow-unauthenticated "$1" < /dev/null
+apt-get install -y --force-yes "$1" < /dev/null
 
 kill $KILLPID
 
diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs
index d8fe0ba..5345d0b 100644
--- a/pbuilder-buildpackage-funcs
+++ b/pbuilder-buildpackage-funcs
@@ -50,7 +50,7 @@ function checkbuilddep () {
     fi
     # install extra packages to the chroot
     if [ -n "$EXTRAPACKAGES" ]; then 
-	$CHROOTEXEC usr/bin/apt-get -y --allow-unauthenticated install ${EXTRAPACKAGES}
+	$CHROOTEXEC usr/bin/apt-get -y --force-yes ${EXTRAPACKAGES}
     fi
 }
 
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index 067c82c..50b9236 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -84,8 +84,8 @@ if [ -n "$REMOVEPACKAGES" ]; then
     $CHROOTEXEC /usr/bin/dpkg --purge $REMOVEPACKAGES
 fi
 recover_aptcache
-$CHROOTEXEC /usr/bin/apt-get -y --allow-unauthenticated dist-upgrade
-$CHROOTEXEC /usr/bin/apt-get -y --allow-unauthenticated install build-essential dpkg-dev apt $EXTRAPACKAGES
+$CHROOTEXEC /usr/bin/apt-get -y --force-yes dist-upgrade
+$CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev apt $EXTRAPACKAGES
 save_aptcache
 $CHROOTEXEC /usr/bin/apt-get clean
 
diff --git a/pbuilder-satisfydepends b/pbuilder-satisfydepends
index 0ca3fb8..5da4315 100644
--- a/pbuilder-satisfydepends
+++ b/pbuilder-satisfydepends
@@ -147,10 +147,10 @@ tolower($0) ~ /^'"${BD_REGEXP}"':/   {p=1}
     
     # now actually install the packages
     echo " -> Installing ${INSTALLPKGLIST}"
-    if ! $CHROOTEXEC apt-get -y --allow-unauthenticated install ${INSTALLPKGLIST}; then
+    if ! $CHROOTEXEC apt-get -y --force-yes install ${INSTALLPKGLIST}; then
 	echo " -> Trying to fix apt error"
 	# Work around an apt bug which causes configure to fail.
-	if $CHROOTEXEC dpkg --configure --pending && $CHROOTEXEC apt-get -y --allow-unauthenticated install ${INSTALLPKGLIST}; then
+	if $CHROOTEXEC dpkg --configure --pending && $CHROOTEXEC apt-get -y --force-yes install ${INSTALLPKGLIST}; then
 	    echo " -> Apt bug workaround succeeded"
 	elif [ "$CONTINUE_FAIL" != "yes" ]; then
 	    echo "E: Unrecoverable error installing build-dependencies." >&2
diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv
index 56926ba..75a524f 100755
--- a/pbuilder-updatebuildenv
+++ b/pbuilder-updatebuildenv
@@ -44,8 +44,8 @@ fi
 recover_aptcache
 
 $TRAP saveaptcache_umountproc_cleanbuildplace exit
-$CHROOTEXEC /usr/bin/apt-get -y --allow-unauthenticated "${FORCE_CONFNEW[@]}" dist-upgrade 
-$CHROOTEXEC /usr/bin/apt-get -y --allow-unauthenticated install build-essential dpkg-dev apt $EXTRAPACKAGES
+$CHROOTEXEC /usr/bin/apt-get -y --force-yes "${FORCE_CONFNEW[@]}" dist-upgrade 
+$CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev apt $EXTRAPACKAGES
 save_aptcache
 
 # optionally auto-clean apt-cache
diff --git a/pdebuild-internal b/pdebuild-internal
index 2557547..61cb602 100644
--- a/pdebuild-internal
+++ b/pdebuild-internal
@@ -29,7 +29,7 @@ set -e
 echo "Using: $Id$"
 
 # I am probably running as root; make sure I have pbuilder installed here.
-apt-get install -y --allow-unauthenticated pbuilder 
+apt-get install -y --force-yes pbuilder 
 
 # I'm not going to have the same LOGNAME as outside, I'm root.
 export LOGNAME=root
@@ -69,7 +69,7 @@ done
 
 export PBCURRENTCOMMANDLINEOPERATION="pdebuild"
 /usr/lib/pbuilder/pbuilder-satisfydepends
-apt-get install -y --allow-unauthenticated fakeroot
+apt-get install -y --force-yes fakeroot
 
 # create the user similar to that used outside 
 groupadd -g "${BUILDRESULTGID}" -o pbgroup