Bug#614315: Patch to change from MD5 to SHA1

2011-02-21 Thread Daniel Silverstone
tags 614315 +patch
thanks

Hi,

Attached is a patch which updates the 'functions' shell file to use SHA1
instead of MD5.  It also updates the perl chunk at the bottom, but obviously
does not update the version of pkginfo available in the bootstrap-base udeb.
This needs updating also, otherwise new installs will fail.

Regards,

Daniel.

-- 
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged.Key Id: 3CCE BABE 206C 3B69
--- functions-1.0.27	2011-02-21 12:30:38.680288222 +
+++ functions	2011-02-21 12:18:50.597829630 +
@@ -228,13 +228,13 @@
 	export DOWNLOAD_DEBS
 }
 
-check_md5 () {
-	# args: dest md5 size
-	local expmd5="$2"
+check_sha1 () {
+	# args: dest sha1 size
+	local expsha1="$2"
 	local expsize="$3"
-	relmd5=`md5sum < "$1" | sed 's/ .*$//'`
+	relsha1=`sha1sum < "$1" | sed 's/ .*$//'`
 	relsize=`wc -c < "$1"`
-	if [ "$expsize" -ne "$relsize" ] || [ "$expmd5" != "$relmd5" ]; then
+	if [ "$expsize" -ne "$relsize" ] || [ "$expsha1" != "$relsha1" ]; then
 		return 1
 	fi
 	return 0
@@ -242,7 +242,7 @@
 
 get () {
 	# args: from dest 'nocache'
-	# args: from dest [md5sum size] [alt {md5sum size type}]
+	# args: from dest [sha1sum size] [alt {sha1sum size type}]
 	local displayname
 	if [ "${2%.deb}" != "$2" ]; then
 		displayname="$(echo "$2" | sed 's,^.*/,,;s,_.*$,,')"
@@ -257,7 +257,7 @@
 			rm -f "$2"
 		else
 			info VALIDATING "Validating %s" "$displayname"
-			if check_md5 "$2" "$3" "$4"; then
+			if check_sha1 "$2" "$3" "$4"; then
 return 0
 			else
 rm -f "$2"
@@ -278,7 +278,7 @@
 		local order=3
 	fi
 	for a in $order; do
-		local md5="$(eval echo \${$a})"
+		local sha1="$(eval echo \${$a})"
 		local siz="$(eval echo \${$(( $a+1 ))})"
 		local typ="$(eval echo \${$(( $a+2 ))})"
 		local from
@@ -300,13 +300,13 @@
 
 		info RETRIEVING "Retrieving %s" "$displayname"
 		if ! just_get "$from" "$dest2"; then continue; fi
-		if [ "$md5" != "" ]; then
+		if [ "$sha1" != "" ]; then
 			info VALIDATING "Validating %s" "$displayname"
-			if check_md5 "$dest2" "$md5" "$siz"; then
-md5=""
+			if check_sha1 "$dest2" "$sha1" "$siz"; then
+sha1=""
 			fi
 		fi
-		if [ -z "$md5" ]; then
+		if [ -z "$sha1" ]; then
 			[ "$dest2" = "$dest" ] || mv "$dest2" "$dest"
 			case "$typ" in
 			gz)  gunzip "$dest" ;;
@@ -442,10 +442,10 @@
 
 ## download
 
-get_release_md5 () {
+get_release_sha1 () {
 	local reldest="$1"
 	local path="$2"
-	sed -n '/^[Mm][Dd]5[Ss][Uu][Mm]/,/^[^ ]/p' < "$reldest" | \
+	sed -n '/^[Ss][Hh][Aa]1:$/,/^[^ ]/p' < "$reldest" | \
 		while read a b c; do
 			if [ "$c" = "$path" ]; then echo "$a $b"; fi
 		done | head -n 1
@@ -504,9 +504,9 @@
 	local totalpkgs=0
 	for c in $COMPONENTS; do
 		local subpath="$c/binary-$ARCH/Packages"
-		local bz2md="`get_release_md5 "$reldest" "$subpath.bz2"`"
-		local gzmd="`get_release_md5 "$reldest" "$subpath.gz"`"
-		local normmd="`get_release_md5 "$reldest" "$subpath"`"
+		local bz2md="`get_release_sha1 "$reldest" "$subpath.bz2"`"
+		local gzmd="`get_release_sha1 "$reldest" "$subpath.gz"`"
+		local normmd="`get_release_sha1 "$reldest" "$subpath"`"
 		local md=
 		if [ "$normmd" != "" ]; then
 			md="$normmd"
@@ -529,9 +529,9 @@
 	for c in $COMPONENTS; do
 		local subpath="$c/binary-$ARCH/Packages"
 		local path="dists/$SUITE/$subpath"
-		local bz2md="`get_release_md5 "$reldest" "$subpath.bz2"`"
-		local gzmd="`get_release_md5 "$reldest" "$subpath.gz"`"
-		local normmd="`get_release_md5 "$reldest" "$subpath"`"
+		local bz2md="`get_release_sha1 "$reldest" "$subpath.bz2"`"
+		local gzmd="`get_release_sha1 "$reldest" "$subpath.gz"`"
+		local normmd="`get_release_sha1 "$reldest" "$subpath"`"
 		local ext=
 		local md=
 		if [ "$normmd" != "" ]; then
@@ 

Re: Meeting(s) at FOSDEM

2009-02-05 Thread Daniel Silverstone
On Thu, 2009-02-05 at 12:30 +, Steve McIntyre wrote:
> >>Then: when and where would be a good time to meet up?

Given we all tend to arrive in dribs-and-drabs on Friday night, I'd
suggest Saturday some time. Perhaps either have a "working lunch" or, if
the group is likely to be too large, perhaps take over the back room of
that bar with the black and white sign near the Atlas hotel in the
evening on Saturday?

Ultimately so long as it's after about 9pm Friday night, and before
about 3pm Sunday afternoon, I'll happy :-)

D.

-- 
Daniel Silverstonehttp://www.debian.org/
PGP mail accepted and encouraged.Key Id: 2BC8 4016 2068 7895



signature.asc
Description: This is a digitally signed message part


Re: udebs to copy to testing from unstable

2004-05-25 Thread Daniel Silverstone
Joey Hess wrote:
boglpowerpc (only!) 0.1.18-1
base-installer  all 0.081
languagechooser all 1.22
The others were done, these are now done.
D.
--
Daniel Silverstonehttp://www.debian.org/
PGP mail accepted and encouraged.Key Id: 2BC8 4016 2068 7895


signature.asc
Description: OpenPGP digital signature


Re: partman-newworld override disparity

2004-04-13 Thread Daniel Silverstone
On Tue, 2004-04-13 at 10:38, Colin Watson wrote:
> Please elevate partman-newworld to standard. The installer should try to
> load it by default on powerpc now that Anton's looked over it for
> sanity.
> (partman-newworld takes care not to be installed on powerpc machines
> where it isn't applicable.)

[EMAIL PROTECTED]:~$ alicia partman-newworld
partman-newworld is in section 'debian-installer' at priority 'optional'
[EMAIL PROTECTED]:~$ alicia partman-newworld standard
I: Will change priority from optional to standard
Continue (y/N)? y
Done
[EMAIL PROTECTED]:~$ alicia partman-newworld
partman-newworld is in section 'debian-installer' at priority 'standard'
[EMAIL PROTECTED]:~$

-- 
Daniel Silverstone   http://www.digital-scurf.org/
Hostmaster, Webmaster, and Chief Code Wibbler: Digital-Scurf Unlimited
GPG Public key available from keyring.debian.org   KeyId: 20687895



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: [d-i] Please change yaboot-installer priority to standard

2004-03-22 Thread Daniel Silverstone
On Mon, 2004-03-22 at 03:54, Colin Watson wrote:
> For d-i to complete an installation on newworld powerpcs without too
> much faffing around by hand, yaboot-installer needs to be installed by
> default on subarchitectures where it's suitable. Now that
> libdebian-installer does subarchitecture checking properly, could you
> please change yaboot-installer's Priority: to standard so that this
> happens?
> Every other udeb that Provides: bootable-system is Priority: standard,
> so this is consistent.

[EMAIL PROTECTED]:~$ alicia yaboot-installer
yaboot-installer is in section 'debian-installer' at priority 'optional'
[EMAIL PROTECTED]:~$ alicia yaboot-installer standard
I: Will change priority from optional to standard
Continue (y/N)? y
Done
[EMAIL PROTECTED]:~$ alicia yaboot-installer
yaboot-installer is in section 'debian-installer' at priority 'standard'
[EMAIL PROTECTED]:~$

D.

-- 
Daniel Silverstone   http://www.digital-scurf.org/
Hostmaster, Webmaster, and Chief Code Wibbler: Digital-Scurf Unlimited
GPG Public key available from keyring.debian.org   KeyId: 20687895



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: Trying again

2003-10-02 Thread Daniel Silverstone
On Thu, 2003-10-02 at 02:41, Matt Kraai wrote:
> > People have told me that the current snapshots are known unusable. 
> > Is this still the case? I had wanted to give d-i another go.
> I don't know them to be unusable.  Then again, I don't know them
> to be usable either.

Turned out that the image I got was still suffering from the E: Function
Unimplemented bug explained on this list.

I'll wait for the weekend.

-- 
Daniel Silverstone   http://www.digital-scurf.org/
Hostmaster, Webmaster, and Chief Code Wibbler: Digital-Scurf Unlimited
GPG Public key available from keyring.debian.org   KeyId: 20687895



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: Trying again

2003-10-01 Thread Daniel Silverstone
On Mon, 2003-09-29 at 20:44, Daniel Silverstone wrote:
> Where can I find what is considered *the* businesscard ISO to test?

People have told me that the current snapshots are known unusable.

Is this still the case? I had wanted to give d-i another go.

D.

-- 
Daniel Silverstone   http://www.digital-scurf.org/
Hostmaster, Webmaster, and Chief Code Wibbler: Digital-Scurf Unlimited
GPG Public key available from keyring.debian.org   KeyId: 20687895



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Trying again

2003-09-29 Thread Daniel Silverstone
Hi,

Sorry to be dense, but I've been very ill recently and can't remember
where things are.

Where can I find what is considered *the* businesscard ISO to test?

D.

-- 
Daniel Silverstone <[EMAIL PROTECTED]>
Debian


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



pcmcia-udeb_0.3_i386.changes REJECTED

2003-09-24 Thread Daniel Silverstone
Hi,

The udeb appears to have no files in it. If this is intentional then 
I apologise and please feel free to re-upload with a note to make 
sure noone rejects it again.



===

If you don't understand why your files were rejected, or if the
override file requires editing, reply to this email.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



pcmcia-udeb_0.2_i386.changes REJECTED

2003-09-24 Thread Daniel Silverstone
See previous reject message



===

If you don't understand why your files were rejected, or if the
override file requires editing, reply to this email.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: Bug#211243: autopartkit: package description is wrong

2003-09-17 Thread Daniel Silverstone
On Wed, 2003-09-17 at 01:31, Steinar H. Gunderson wrote:
> On Tue, Sep 16, 2003 at 09:56:08PM +0100, Daniel Silverstone wrote:
> > On Tue, 2003-09-16 at 19:56, Steinar H. Gunderson wrote:
> > > Severity: minor
> > Perhaps I'm alone in thinking this, but surely this is kinda more
> > important than 'minor'.
> Well, it gives warnings in big letters (with priority critical and default
> value no) before it does anything at all. Since the package description isn't
> used during installation at all, I filed it `minor' -- the bug doesn't affect
> the usability at all, and is unlikely to make the user destroy any data
> he/she wouldn't have without it.

Thanks for the rationale.

Right now, it strikes me that the new bugs filed against d-i really
ought to have as full a rationale behind them as possible, rather than
short snippets which only make sense to the filer and perhaps one other
person. That way, innocent bystanders like myself, or perhaps other
people who want to assist, will be able to better choose which bugs to
tackle.

D.

-- 
Daniel Silverstone <[EMAIL PROTECTED]>
Digital-Scurf


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: Bug#211243: autopartkit: package description is wrong

2003-09-16 Thread Daniel Silverstone
On Tue, 2003-09-16 at 19:56, Steinar H. Gunderson wrote:
> Severity: minor
[snip]
> currently it destroys everything on disk.

Perhaps I'm alone in thinking this, but surely this is kinda more
important than 'minor'.

-- 
Daniel Silverstone <[EMAIL PROTECTED]>
Digital-Scurf


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: d-i experiences

2003-09-16 Thread Daniel Silverstone
On Tue, 2003-09-16 at 14:02, Chris Tillman wrote:
> I went through the templates a few months ago to edit English,
> I am happy to do it again. Do you remember which ones seemed
> out of whack? Maybe I'm missing some.

I will have to go back to my notes and try again to be sure, but my
memory of it was something like:

Dialog title: 
Subtitle: Ready to ?
Body: WARNING this is really bad and bad things might happen

 

Very poorly worded. Something more like:

Dialog title: 
Subtitle: About to perform 

Body: 
WARNING: This is a potentially damaging operation and you cannot reverse
the effects after you finish.

Are you sure you wish to continue?

 

D.

-- 
Daniel Silverstone   http://www.digital-scurf.org/
Hostmaster, Webmaster, and Chief Code Wibbler: Digital-Scurf Unlimited
GPG Public key available from keyring.debian.org   KeyId: 20687895



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: d-i experiences

2003-09-16 Thread Daniel Silverstone
On Tue, 2003-09-16 at 10:18, Geert Stappers wrote:
> See http://www.nl.debian.org/devel/debian-installer/getting_started
> for more information.
> All help is welcome.

Unfortunately the most help I can offer is an hour or so of my time
testing an installer every few days.

I have huge amounts of my own stuff to get done, including a day job,
running an ISP in my "spare time", my Debian duties as they exist
already, my duties to my family and personal life, and then all the rest
of it.

I'm really quite worried about d-i now, so I'll try and put aside more
time to help with testing it, but I doubt I could get up to speed and be
useful developing for it within two months, possibly more.

As another comment, many of the dialogs seem incredibly poorly worded,
often in very broken english, sometimes making no sense at all. Also
sometimes the 'Go Back' button appears, but cannot be highlighted
through any means I have tried.

If there is someone in the UK, preferably in Cambridgeshire, working on
d-i, who would like me to sit with them as a 'user' and demonstrate the
issues with the installer, I'd be glad to. As it stands, I am not sure
I'll have the time to help anywhere near as much as I should anyway.

D.

-- 
Daniel Silverstone   http://www.digital-scurf.org/
Hostmaster, Webmaster, and Chief Code Wibbler: Digital-Scurf Unlimited
GPG Public key available from keyring.debian.org   KeyId: 20687895



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: d-i experiences

2003-09-16 Thread Daniel Silverstone
On Tue, 2003-09-16 at 02:46, Steinar H. Gunderson wrote:
> This is a bug in usb-discover, which should be fixed in the latest upload,
> ie. it should reach the netinst CD soon. :-)

> This is a bug in busybox ash, which again should be fixed in the latest
> upload and reach the netinst CD soon.

> This is a bug in main-menu, which _again_ should be fixed in the latest
> upload. You seem to have gotten rather unlucky :-)

> Yes, I've reported this very same bug earlier today. :-)


So, when can we expect a fixed businesscard iso image? (Since that's the
image I most care about)

D.

-- 
Daniel Silverstone   http://www.digital-scurf.org/
Hostmaster, Webmaster, and Chief Code Wibbler: Digital-Scurf Unlimited
GPG Public key available from keyring.debian.org   KeyId: 20687895



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



d-i experiences

2003-09-15 Thread Daniel Silverstone
Hi,

The following is a record of my d-i experiences today...

I took a little time out at work today to try d-i.

I fired up a bochs machine and booted the netinst CD

It sat looping saying "unable to load vesafb.o"

This was a bit of a disappointment, so I waited until I got home.

Once at home, I figured I'd do what I consider the most common form of
installation I do. I.E. the equivalent of install from boot/root/drivers
-- I downloaded the businesscard ISO and fired up a vmware.

The following are my notes following the hitting of 'enter' at the boot
prompt. They're pretty much in order and can be considered to be
regarding the use of the businesscard installer on x86 as I found on
http://gluck.debian.org/cdimage/testing/netinst/i386/ after Sebastian's
posting to debian-devel-announce.

Firstly, the framebuffer console is incredibly slow. But I can cope with
this...

The first menu d-i presented me with having booted was in English. It's
very very lucky I speak english, or I wouldn't have known to press Enter
in order to be able to select English as my language of choice for the
installer.

I selected 'detect cdrom' and d-i kindly told me there'd been an error
whose text was 'EXIT' before succeeding to detect the cdrom

On the loading modules page, many of the descriptions don't fit, this is
poor UI design

At this point, I hit 'go back' twice because I didn't want to install
any modules and couldn't see what to do.

On the second 'go back' I got an error. Apparently anna's postinst
(whoever anna is) exited with status 2560 (whatever that means)

Eventually I worked out that I wanted to 'continue' past the modules
page without selecting any modules (mmm intuitive)

Following this, we tried to configure the modules. This went acceptably,
although many descriptions overflowed the dialog they were meant to fit
into.

I decided to configure my NIC by DHCP. I selected this option and
answered the questions it asked me. It then presented me with what
looked like a post-DHCP configuration output and asked me if it was
okay.

After realising that this was the pre-DHCP dialog, I continued,
continued again, and ended up back at the main menu with no indication
of whether or not the DHCP succeeded. All I knew was that d-i had
highlighted the PPP/serial option suggesting to me that DHCP had failed.
(It hadn't)

I then decided to configure which mirror to install Debian from. But the
UK appeared to be missing from the list, so I configured the mirror
manually and was returned to the main menu, with PPP/serial selected

Having partitioned my drive the hard way I tried to create filesystems.
The d-i businesscard installer appears to be missing reiserfs as a
default option for filesystems. This is poor and should be rectified.
After all, the bf24 bootfloppies series managed it.

This part of d-i failed to take notice of my partition types and kindly
offered the option of creating swap on my / partition, and indeed
creating an ext3 filesystem on my swap partition.

As I fought my way through the partitioning and formatting options I got
many error dialogs containing what look like the output of cfdisk, only
containing piles of escape strings too.

I selected 'install packages' and wandered off to another terminal
because it made the the install go a lot faster. I happened to chance
upon the syslog terminal which seemed to be logging a whole pile of
errors of the form:

installer[21577]: WF: Retrying failed download of %s

Where the %s really was '%s', I'm not introducing a placeholder here,
the error message was failing to perform the substitution.

After installing base, the 'debian-installer' process exited and was
restarted according to the syslog console

I chose install-kernel, unfortunately d-i seemed to think I should
install base again. It chundered through for a bit and then gave up,
giving me the error that debootstrap had failed and I should look in
/target/var/log/debootstrap.log for information.

It seems debootstrap barfed on an id call, something to do with [ and
then an attempt to ln /usr/bin/awk

At this point I decided I'd not get a working system, so I stopped the
vmware and wrote this email instead.

If this is the current state of the installer, I'm very concerned that
we'll not be able to release sarge on time; or that we'll have to fall
back to boot-floppies for the most part.

Regards,

D.

-- 
Daniel Silverstone <[EMAIL PROTECTED]>
Debian


signature.asc
Description: This is a digitally signed message part