Bug#429885: Debdiff to fix bug "broken --stdin-stdout option that writes to stdin"
dAniel hAhler <[email protected]> Wed, 27 Jun 2007 00:09:54 +0200
| Newsgroups | gmane.linux.debian.devel.bugs.general,gmane.comp.gnu.httptunnel.bugs |
|---|---|
| Message-ID | <[email protected]> |
--nextPart10969498.2bYuPDI1eA Content-Type: multipart/mixed; boundary="Boundary-01=_y6YgGVvnTNu6d+M" Content-Transfer-Encoding: 7bit Content-Disposition: inline --Boundary-01=_y6YgGVvnTNu6d+M Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Tags: upstream I have a debdiff, which includes this patch. I had submitted it to Ubuntu=20 already (https://bugs.launchpad.net/ubuntu/+source/httptunnel/+bug/121458),= =20 but forgot to give credit for the patch in the changelog. Therefor, instead of creating another debdiff just for Ubuntu, I'm submitti= ng=20 it with a fixed changelog to Debian now. Please note, that I'm not using httptunnel myself and have not tested the=20 patch either. Additionally, I'm still unsure about the changes to config.su= b=20 and config.guess included in the debdiff. --Boundary-01=_y6YgGVvnTNu6d+M Content-Type: text/x-diff; charset="us-ascii"; name="httptunnel_3.3-4.dsc.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="httptunnel_3.3-4.dsc.diff" diff -u httptunnel-3.3/debian/changelog httptunnel-3.3/debian/changelog =2D-- httptunnel-3.3/debian/changelog +++ httptunnel-3.3/debian/changelog @@ -1,3 +1,10 @@ +httptunnel (3.3-4) unstable; urgency=3Dlow + + * Israel G. Lugo fixes broken --stdin-stdout option that writes to + stdin. (Closes: #429885) + + -- dAniel hAhler <[email protected]> Tue, 26 Jun 2007 23:36:31 +0200 + httptunnel (3.3-3) unstable; urgency=3Dlow =20 * Fix typo in copyright file. (Closes: #281174) diff -u httptunnel-3.3/config.sub httptunnel-3.3/config.sub =2D-- httptunnel-3.3/config.sub +++ httptunnel-3.3/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, =2D# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. =20 =2Dtimestamp=3D'2006-02-23' +timestamp=3D'2006-09-20' =20 # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -240,7 +241,7 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[6= 7] \ | am33_2.0 \ =2D | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | av= r32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -248,7 +249,8 @@ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ =2D | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore= \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -274,21 +276,19 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ =2D | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]= le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[= 1234]le | sh3ele \ | sh64 | sh64le \ =2D | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ =2D | sparcv8 | sparcv9 | sparcv9b \ =2D | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite= \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ =2D | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=3D$basic_machine-unknown ;; =2D m32c) =2D basic_machine=3D$basic_machine-unknown =2D ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=3D$basic_machine-unknown @@ -318,7 +318,7 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ =2D | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ @@ -329,7 +329,7 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ =2D | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -358,23 +358,21 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ =2D | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-= * \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ =2D | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-*= \ | sparclite-* \ =2D | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* |= sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ =2D | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; =2D m32c-*) =2D ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -912,6 +910,10 @@ sb1el) basic_machine=3Dmipsisa64sb1el-unknown ;; + sde) + basic_machine=3Dmipsisa32-sde + os=3D-elf + ;; sei) basic_machine=3Dmips-sei os=3D-seiux @@ -1128,7 +1130,7 @@ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=3Dsh-unknown ;; =2D sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=3Dsparc-sun ;; cydra) @@ -1217,7 +1219,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ =2D | -skyos* | -haiku* | -rdos*) + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1369,6 +1371,12 @@ # system, and we'll never get to this point. =20 case $basic_machine in + score-*) + os=3D-elf + ;; + spu-*) + os=3D-elf + ;; *-acorn) os=3D-riscix1.2 ;; @@ -1378,9 +1386,9 @@ arm*-semi) os=3D-aout ;; =2D c4x-* | tic4x-*) =2D os=3D-coff =2D ;; + c4x-* | tic4x-*) + os=3D-coff + ;; # This must come before the *-dec entry. pdp10-*) os=3D-tops20 diff -u httptunnel-3.3/config.guess httptunnel-3.3/config.guess =2D-- httptunnel-3.3/config.guess +++ httptunnel-3.3/config.guess @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, =2D# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. =20 =2Dtimestamp=3D'2006-02-23' +timestamp=3D'2006-07-02' =20 # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -210,7 +211,7 @@ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} exit ;; macppc:MirBSD:*:*) =2D echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -770,6 +771,8 @@ case ${UNAME_MACHINE} in pc98) echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-= (].*//'` ;; esac @@ -780,9 +783,6 @@ i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; =2D i*:MSYS_NT-*:*:*) =2D echo ${UNAME_MACHINE}-pc-mingw32 =2D exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -790,10 +790,10 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; =2D x86:Interix*:[345]*) + x86:Interix*:[3456]*) echo i586-pc-interix${UNAME_RELEASE} exit ;; =2D EM64T:Interix*:[345]*) + EM64T:Interix*:[3456]*) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) @@ -831,6 +831,9 @@ arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -989,7 +992,7 @@ LIBC=3Dgnulibc1 # endif #else =2D #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun) + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) ||= defined(__SUNPRO_CC) LIBC=3Dgnu #else LIBC=3Dgnuaout only in patch2: unchanged: =2D-- httptunnel-3.3.orig/common.c +++ httptunnel-3.3/common.c @@ -314,7 +314,7 @@ =20 /* If fd =3D=3D 0, then we are using --stdin-stdout so write to stdo= ut, * not fd. */ =2D m =3D write_all (fd ? fd : 0, buf, (size_t)n); + m =3D write_all (fd ? fd : 1, buf, (size_t)n); log_annoying ("write_all (%d, %p, %d) =3D %d", fd ? fd : 1, buf, n, = m); return m; } --Boundary-01=_y6YgGVvnTNu6d+M-- --nextPart10969498.2bYuPDI1eA Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQBGgY63fAK/hT/mPgARAkIHAKCLHy/hGqMxYS4vfp06girQ9w7lkACfVl4L rUmN3Uajn6I6S4MuCPXilDk= =/EjU -----END PGP SIGNATURE----- --nextPart10969498.2bYuPDI1eA--