From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun, 6 Nov 2011 15:51:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=5b7268befaa7b1151a7e1fc82c11bc66dfad5b4b;hp=ef8fa98d6c5d12d2f6f2aeac95b507843ebd3672

Merge remote-tracking branch 'origin/master'
---

diff --git a/.bashrc b/.bashrc
index 20e8c48..f401ff2 100644
--- a/.bashrc
+++ b/.bashrc
@@ -69,6 +69,8 @@ _bash_profile_addpath -f PATH            "/sbin"
 _bash_profile_addpath -f PATH            "/usr/sbin"
 _bash_profile_addpath -f PATH            "/bin"
 _bash_profile_addpath -f PATH            "/usr/bin"
+_bash_profile_addpath    PATH            "/usr/lib/ccache"
+_bash_profile_addpath    PATH            "/usr/lib64/ccache"
 [ $EUID -eq 0 ] && _bash_profile_addpath -f PATH "/usr/local/sbin"
 _bash_profile_addpath -f PATH            "/usr/local/bin"
 _bash_profile_addpath -f MANPATH         "/usr/X11R6/man"
diff --git a/.ssh/config b/.ssh/config
index 72fa7bb..f4b7378 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -2,6 +2,7 @@ IdentityFile ~/.ssh/id_dsa
 IdentityFile ~/.ssh/id_rsa
 IdentityFile ~/.ssh/identity
 IdentityFile ~/.ssh/koji-id_rsa
+IdentityFile ~/.ssh/id_dsa-sourceware
 
 Host localhost
 #Cipher none
@@ -75,7 +76,7 @@ LocalForward 3886 kerberos.iad.redhat.com:88
 
 ProxyCommand none
 StrictHostKeyChecking yes
-Host rawhide64.englab.brq.redhat.com
+Host rawhide64.englab.brq.redhat.com shell.lab.bos.redhat.com
 User jkratoch
 Host tofu.yyz.redhat.com
 User hudson
@@ -94,7 +95,8 @@ User jkratoch
 #ProxyCommand /usr/bin/ssh ovpn-phx2.redhat.com exec nc %h %p
 #ProxyCommand /usr/bin/ssh 209.132.183.3 exec nc %h %p
 #ProxyCommand /usr/bin/ssh host0 /usr/bin/ssh 209.132.183.3 exec nc %h %p
-ProxyCommand /usr/bin/ssh -W %h:%p 209.132.183.3
+###bastion:
+###ProxyCommand /usr/bin/ssh -W %h:%p 209.132.183.3
 StrictHostKeyChecking no
 NumberOfPasswordPrompts 6
 Host shell
@@ -127,6 +129,9 @@ Compression no
 Host bombadil.infradead.org
 User lace
 
+Host nokia6
+User root
+
 Host hotelgate hotelgate.hotelsevendays.cz
 User root
 Host hotelgate
@@ -139,6 +144,9 @@ User lace
 Host tercie.tone.cz
 User short
 
+Host fencepost.gnu.org
+User jankratochvil
+
 Host neutron.fjfi.cvut.cz
 User short
 
diff --git a/.ssh/known_hosts b/.ssh/known_hosts
index b4dbf98..f81cbe9 100644
--- a/.ssh/known_hosts
+++ b/.ssh/known_hosts
@@ -412,7 +412,6 @@ ibm-hs21-01.rhts.eng.nay.redhat.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAr6iPKL84
 rtt2.s390.bos.redhat.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1WnBEZqmnYg7MR0+UDtMMTY+OO+v0DXIDrrJAcyQJZkIX+tNchpPMkFZgUsZ4WvLB4qILr0WlEavOSBWEWX0I87cimIOabb8yEYwVPUWDFH0kyaVYSp8INbnQOmU8SGmvxfm2ccxj3xqC/QXBxSbXbYU+XPPylt2AIAd5MGWT3KCblBHQjz8nmwZwt14uxXRSf45Zp3pKvtOBvqh+6nMcwVtXa8Qz8V4AZLlhX99dcg7Kb98E29nzBr0N5RjqpRRSetFic7aBPZssHwINH65exnQKUG+p/Podh6G4zWguD4B/hcdI7SQ2aGTP7SYNENFOXBhVKDzGI4sB1h2OUgMTQ==
 file.bos.redhat.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAsO54aqYqIggMXdvhDcG9SNgihC8OqU63tUnsO6ARDCyn4ySsKwpf+fqpAmpDJPbMwvJOqQuHZyX6m4te+XKBo0b1YeWmS0kUC5d0crkP0eKnHMyg1tLiN7t7WM6ez9BuFzX5nWJbzAm052Bj/iugIr2zKvSr8XcQWGFM35KoHTXv7hA0BJhKsSB96aC/k/hl8Vv0EwaSxhDV/DP8WOSdcpB/OYqWoXKOYJAmbup7WWV52DDLGyo24DJ7wVFt9o8zgEM1yZgz99ZqCojV+a6ll0ePvgyyCEWnbGI/asueqDQkSLWU7QR1wTPSsZmlwox1+y83xbNnUNhZxDEIV2JGVQ==
 10.10.28.34 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAu0Ju+LnqKPPH4WYnlUrNTu/P3xWIlkh475e76zjNuqqVYeKR34Pf+teoWITL0+V5FJ+F4xndwqQ9Sc1UHpvpDEJYTf0OCZJzZ2d1NrRcNboRsqyZBSe4yEFqBeeKS/HZ+OTZRj+bwGrZKYe/Qe3sDeUQYdwl1STo5qRQAw08mKE=
-192.168.66.2 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAwmnu0frM/VucoSlXbugAUGhkdlDajJNDkvkWwgEXz5HcTPrHQnVFRYRHFNI/QhUTItp7MhGQ4fHQTrg+gTGYXOALikm9ax/yKP/mNi8wYJl02sGNAQAaNEjOe4zLKjYxUfqUl+9dBrGcfV6XYfkVWWgaeCnBtxNvNzmBJBMz04s=
 host0 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAwmnu0frM/VucoSlXbugAUGhkdlDajJNDkvkWwgEXz5HcTPrHQnVFRYRHFNI/QhUTItp7MhGQ4fHQTrg+gTGYXOALikm9ax/yKP/mNi8wYJl02sGNAQAaNEjOe4zLKjYxUfqUl+9dBrGcfV6XYfkVWWgaeCnBtxNvNzmBJBMz04s=
 shell.lab.bos.redhat.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAsonbfVlxd47NixVVdDZI/EqnVSU+EOSSoclbwI+BuQZSUhAvGnSYa07WziVc8q3wjpN4ZfHHHqIKqOWLHb8AsXoCyEDvIek/hD3IxtkWxJgKij0xZ0KAKIu4NJP85GPs5CyHKq+P0gNEceuqbQN5/9MfJGCJicZWjPnmJSqRdL8LqPGoYVW9S8InZVnm/uCtjhZrasJDJs/W3H4QKL7ZeUQOU4e3//jljRHHSzA6Pk4yJ+4FrbXQoYQE+ccpBArXpaqEUXaVYq6Job4D9Wthrf7GWOTCk8InrOaF9rw4kgS7ryPBZZJZMC/3HjAs9gnTTI36hxLKhRwumG4UH9j5Zw==
 pkgs.stg.fedoraproject.org,140.211.169.198 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA3ytlPtrMxf1060iZ82xxMqVov+gNwuiobQu1Rn0SXkRlmVMMtXxGIfPRjTA2Y27QsjEDxm7qAwnEjI9bKHBf2fJClJYAG6qoHObmUNp7s6y0tUcEThG/zoDxt1BVkJY9k1Hdg7EoQtKd7DaDnc4ULu4wF2asldQ/YZwR/zmHUQrHYRn7SpG3sS8EGhdOyWDTZ9ABWZNfBIj+0vvdLbFctGgINarREBijjMtrhP4rgXz0HGbOu3+/CFIArpNH96zTpdeeZ4rEUFbth1lyuyoQ9oaQv6Khu5e8mcfDI/rXlDpOapxsVA9qrMSXqwQIo6g55lDLBUPc6URlWwL0RN2vpw==
@@ -496,7 +495,6 @@ neutron.fjfi.cvut.cz,147.32.8.224 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAro3U5tj/ks
 195.47.113.193 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAn3gjAPN/iHzWlBOkHZzihR1T/q+CiHjGBWKfJp24tK1qIGT0W6P/zIIRcF5jL7/Cjvh9TfIS9QGlxsqzBoiVW6enoQWM9gb1odEt17nS/bxUoillfS+mMzXcE4RuNlS+vMnTieSnNykZ3dSnYo9vot6m+pkpRSTFkWl2cRweMsRAb0sDQyqL4UqocLM79g5spMmtSLIGvc054mwdJE6Qttn0C7n16AGhDonfYSDkjY0s2U76yFdzDF0YmXRFatC4ZF8tJV7JYU3vVTZGTmQ3Nqe4SrwO1hqrop51TXpniL9Zt9K7X6eTgdeszQ58IGQt32ZTOeCjegnXCnnD8OIJFQ==
 147.32.10.175 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAro3U5tj/kskJyNHuUFWO+7GmkBlY8pOQYxmq5hjzZscsP/LH7KQWBH3rzNMYfnf6iGc3V8E1Q+EQFaWWIJXjK8ZuMT/9h2LErEnrGymPR7/A2IRaEuYUsUNKYKbyHEYP9e26ZeUrRlhBYzT5MUMAI5gIJtqKpq2MKSY1eYnoc+0=
 deda ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAv+cVNFU4D0WswBrYxKYxD2uO0Vipba4aFsCASN3nPDtNxMwiUbie5/u2aq4ud/vdFPrJDC7MJnBQ2NMLhtLcXSuLjLfJMmdo7qW3FG0AURccOtWyyuVA3iO8XXEI9/GqOGkd+XNYt95PPKyfNloUdb0wcfaP6gA8NmaudrbCa/YeVrEnCHhH1HelR3IQ7pnkkZLx7SaYwiyU0XnVnd2vOxmm+tKv6WofvZfZOYlN/xJFQ5epjR58p3FVPYFkZIl2yTNE9EAd6zPiez0ZS5SAGtCeyfJ6IBT3jfmSF8ulHLV76e14NcR8CyFecOVswz6QJIlIMkrknK9HQTa9w1XQiw==
-ap6,192.168.66.6 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgwClFqcSMD6M/281yAWM/ysxrb8Mz0bYnRqNDVLLmcGpwI5tJNAsUrW4nD+oSNM7W7p6peBTr+H6OJe+0lfKLUkFvlb3ejFeC3I/mNOHiLDUcDQ0YXHbvFvccX03cRHd+vg/kTgU9AD7Tcn326pJJD5/FE3v90u7ZGJmIuJp/7r+thnz
 jindriska.tnsmi.cz,193.165.74.190 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAxzIx6EJkOewTQMfuwFVlYUok0+RiJ6vwIU+73RwQPdU/YIzKqXFUtbmtWkASBhGzGBnXCNjQzyzFEfohJQ80f5NaQ1lP+fUAMtd5a+d8BgDqjvoNB2sUyuF6PPsulURnDSY4qW8gdX1Q+hWIqY4IyJNSQHUSr7/42e0bpzofmrGrFrA/FyUZ3uHrkmNAlaOAJ6c2b/xFuMi27Nt5xGQzXNUAyDoxBdODwZHLCojG2KTFicAPNqRkzyqbjderDfxo1hNfPs/oNfKLlIIgkuHczaKZi3XqzT7dlTK8R+26KqdeUgq5gTD+YgzECMeDZs/sT3NNlSulKZ0YMXypqiAQPQ==
 manon.vellum.cz,89.250.243.243 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvcR7MMPt3Waftl/VQN6rgrIMfWFwqBmMy9+rL8ED9orG/ssUkizqKjzygI6Njuh4/wzuBOA6RlyB2qYThJx8l3UFszzvQJpTcn+CfS1knSoX18oaF92ezJNL7EXEuAKflyWMXjgcG5IMxtjUcEurgX2GP2RndKltDceQuf6PpN2Hm0yN8q8Ri5TkLH4sGrcU+55MBURb2CINN7wuAibVNH15N+fy5AX3zPTDcjjBMlMqi20YKoLUB3bZPxArqIi7fSMSfb7+UTuuakY/TU1au9BWizaai4Othi2CwusMfhxukW2W9GKVpJc4rMbYlq/d/8mIeRgHsIqGUaUa9mFg0w==
 cvs.jankratochvil.net ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvcR7MMPt3Waftl/VQN6rgrIMfWFwqBmMy9+rL8ED9orG/ssUkizqKjzygI6Njuh4/wzuBOA6RlyB2qYThJx8l3UFszzvQJpTcn+CfS1knSoX18oaF92ezJNL7EXEuAKflyWMXjgcG5IMxtjUcEurgX2GP2RndKltDceQuf6PpN2Hm0yN8q8Ri5TkLH4sGrcU+55MBURb2CINN7wuAibVNH15N+fy5AX3zPTDcjjBMlMqi20YKoLUB3bZPxArqIi7fSMSfb7+UTuuakY/TU1au9BWizaai4Othi2CwusMfhxukW2W9GKVpJc4rMbYlq/d/8mIeRgHsIqGUaUa9mFg0w==
@@ -511,7 +509,6 @@ dvi.elcom.cz,81.91.214.162 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA9eyHDOPrHvgkns0fx
 host1.dyn.jankratochvil.net,2001:15c0:65ff:2a2::2 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAqO8QNvnaRm2fAEic2FTZwpmBu9yQ8UrR5J1FmQc+YpZzXxOnUYBZpsjdvT23c4Ru5DnUyPprilJm7GbdVskNfIxXAV/CT/DFRaB83YRsxIjmH0GKAwZDlH+NpwZwVTveSCkoQelQn4kDaWnHfF3FI/qa8T3oSj9kp5Ijf1qZgsECtuOj8emNbWWnMFVqEpZTQ4Sn/JbhhKF2HVHxrdpOerlW5EwiuTBxhw/AFtouzlWsmEZfFaxPRCtq0tUr7Lf8ykbI3sOGTRmbr0SXE9A9IWvR1dvtwtIE/+PKDTNgOUnPBusGPe9Rc/8RTCzAFT5hMGTXia0UY3MQut99hgbRlw==
 jh.tnsmi.cz,90.182.46.91 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAt4jNZeZACKVpO8wD6qKZc5zTnzZGHEYj+Evv4r+gia5O3mE6ipQDJMhEueZ+jmuDt8iQwRu4umoc9fQ9za1QbqbO7yVgIRy5b5UU6Us7atVWgarsKegvZW4S3dlDZLwCP4E3nOdblXe5rLlbT2JPVV0bGBocid0+O54yYyPMmoj5FiVD2qI6UVEHXK8FLwtRJek6/qx1PypOOy6SzWFmtZdH1Tfu0B6Sy72IyMDkDS5qh29F1iQJCA/7aRILBYXUJObXriWiYmurGvlPsEIDwTgIZhVnnj7aU3/FAJRFjEPKuCmUcDa4dbN8HemunOQpPPYLnb3GLf3sT48mSRvukw==
 hg.guifications.org,208.100.10.20 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAnJY8jXwcfxkVO24VDhK1RGyCdgqvL2Juh4UBnAuTnxRESsKFkqNpCv71D9T8PRQ7VZdkE6CRf0Co8ZVOw6NaAdnViVL2Q/j2d6kqJqsGlWgIEbh7UTV+403qt2gR8s5aIZBez3FO3MWPCnkaYAxa+KAXRBrKIHlokfPUYgnPL1yAw/BSSCuGAgIFPJQtaiM4ba1xJDRz+HxbqIu3ENKAZqZgPJjn9nVG4k/I/R4XmIAaKbqktdZLHHYgvpAVH84ugQh5TchTL83pIYs3B68KtKyOqsPx23ul6+/tg1T25gfLOBYH1V0ZJU5+NdUkKXiQ90V7UzFWTqPguRM7uPZIew==
-192.168.66.2 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAwmnu0frM/VucoSlXbugAUGhkdlDajJNDkvkWwgEXz5HcTPrHQnVFRYRHFNI/QhUTItp7MhGQ4fHQTrg+gTGYXOALikm9ax/yKP/mNi8wYJl02sGNAQAaNEjOe4zLKjYxUfqUl+9dBrGcfV6XYfkVWWgaeCnBtxNvNzmBJBMz04s=
 jklabs-server,95.168.193.90 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuA+CrqK6CLeuC5aEeuZ1cpdOBIvXlsYOt5I9x9QVLYy19mt4IiBa9fH1E6FG/l7gW6dYGi5oAPzID1We+3jiod89jm+Wi2LHL8+u6I0cEM/935zgE3q/v+VpxbIwXz1ypnrPzK/jJJ7qAzkUl0vXJfvGrVET4gONizyg0Kz44O1Iw0Fhj/qUwIWZv4whTMLKTFEUvEDv/ms+aEhYi2E1BShvmk6Id7ZxnfDlSWygM7OGyg4/BoBAx3c/QHKV2L5eNchs+mOogVTl3rJRKxWADvprrS9e4pZSEmiA0hT0zIqZcwOOevPWMgy4Y7F5T6FUnSfWjJ1pA/ls/3UKM+87Qw==
 46.28.109.124 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAw51frW/O9Pi2f775Vt8IOHXTl1N8s1lUNzZ7twUac1Fjn4/wpGBBbO+NaF7snjMIYdUdRdC6cuqISVs46SOysjO6DXvRuCnLS+96nzmf/rgmZkyfuhoerhQ7+mAXDb00Uoa6mdWUgaAGUEHd7lRdt3Ix2NnlFHVwb5oCbJV/t/pq25H+ADP6XT/Vv2qtaqJWRA/eSMAX84X0b/wdv+uXlWUlv5oo7VentLMncwqV/lYy3U4y8QnoU0NNDxMEj4fcoJVVEVUxgxTD/5ng5hwd5sfUdxHDenEli6zH5TjwENxRHqqoUFAOqBgVLkRBhwlyQgCQ3+mkw0nPA9bIZQXyrw==
 vps.jankratochvil.net ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAw51frW/O9Pi2f775Vt8IOHXTl1N8s1lUNzZ7twUac1Fjn4/wpGBBbO+NaF7snjMIYdUdRdC6cuqISVs46SOysjO6DXvRuCnLS+96nzmf/rgmZkyfuhoerhQ7+mAXDb00Uoa6mdWUgaAGUEHd7lRdt3Ix2NnlFHVwb5oCbJV/t/pq25H+ADP6XT/Vv2qtaqJWRA/eSMAX84X0b/wdv+uXlWUlv5oo7VentLMncwqV/lYy3U4y8QnoU0NNDxMEj4fcoJVVEVUxgxTD/5ng5hwd5sfUdxHDenEli6zH5TjwENxRHqqoUFAOqBgVLkRBhwlyQgCQ3+mkw0nPA9bIZQXyrw==
@@ -528,3 +525,16 @@ cindy.vellum.cz,195.144.124.19 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAvp/yjJeZILi5r
 rallye.panda.cz,217.11.227.56 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAxFaLaa/pLDVw/jXmkzBIdaZNJowfUJ19bB1dInGJpd4Ji8vGUMGeNLUTEb2xo7AqnHC6hc6f38ub6Q6of7MxEorFLH1SRsYSt2SkUHhJTddJnJHP7fbZUFxm6MhEbDkB109ecUCZpF3SEWqlCosK7kBCXTgawJuQP4P6xVX2QQ8=
 gwold.jklabs.cz ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAy6hLRrIbDATf1nlDmX1SlefKJC4r++tQgVHkfu/Bf0pg6UddI6fEd0zqKSAbXTIXWexcgtdz38NXX8HCqoiQo4GIkT0RcThJOK2oa3g2bvwqo3vDeuEvB30yZkJKHqoU6vKTHZDeMmk6ir1wXQb6ypLLQt0prCAzq3CkunZuwVE=
 2a01:8c00:ff00:5d::2 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAw51frW/O9Pi2f775Vt8IOHXTl1N8s1lUNzZ7twUac1Fjn4/wpGBBbO+NaF7snjMIYdUdRdC6cuqISVs46SOysjO6DXvRuCnLS+96nzmf/rgmZkyfuhoerhQ7+mAXDb00Uoa6mdWUgaAGUEHd7lRdt3Ix2NnlFHVwb5oCbJV/t/pq25H+ADP6XT/Vv2qtaqJWRA/eSMAX84X0b/wdv+uXlWUlv5oo7VentLMncwqV/lYy3U4y8QnoU0NNDxMEj4fcoJVVEVUxgxTD/5ng5hwd5sfUdxHDenEli6zH5TjwENxRHqqoUFAOqBgVLkRBhwlyQgCQ3+mkw0nPA9bIZQXyrw==
+reserved-8-250.bne.redhat.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYJf5XsvlsK849UfMAZxRyQCoHA6M0K++UHyc5hEtKYaFXeTw69haAt5FmT4oS2a36Qltu+RLsUm0bLWjZgcUesUoP0OLeaFeqqSDdjOy5vmH6GCQ9BBTofBnNn4BGLigid17tZEdaEkaDzK2r1pcnK+5cwdr6v7u5Fq2Cat28lKLN2Rrn1a/uip9LVPuGQ4+W1otwn1OhSy/1O66M9N5IBMxwCUBH1/HPHV128A3rxcRCAkMpVDqDp7CWCg2JrEaHNQZN3V/RbaUMf30f1YUWqvK+aBrTVcELIS6ljtuDVSd+lEHh+N5pL9OylWxBRed1MX9D8YwcjWj4q/An6J3L
+10.16.36.33 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAsonbfVlxd47NixVVdDZI/EqnVSU+EOSSoclbwI+BuQZSUhAvGnSYa07WziVc8q3wjpN4ZfHHHqIKqOWLHb8AsXoCyEDvIek/hD3IxtkWxJgKij0xZ0KAKIu4NJP85GPs5CyHKq+P0gNEceuqbQN5/9MfJGCJicZWjPnmJSqRdL8LqPGoYVW9S8InZVnm/uCtjhZrasJDJs/W3H4QKL7ZeUQOU4e3//jljRHHSzA6Pk4yJ+4FrbXQoYQE+ccpBArXpaqEUXaVYq6Job4D9Wthrf7GWOTCk8InrOaF9rw4kgS7ryPBZZJZMC/3HjAs9gnTTI36hxLKhRwumG4UH9j5Zw==
+10.5.19.30 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA8MQEQu0I3OCh3TVBC+96Y7XIDmhv8C/M6okiVmN9KhawNrzcpmO0ME8jBUIwLFsxoH68GmHOrzhxeCrOZCPLZlqy4UVfa9VAM/H5SpWEhEa992d03f5RgK+VLl+JmiJNbGN3vWQ8Dx3EBj+40A7+Vr3No6B6+yyAzvMGH/8gm9QGc0f+eZo9xd4k9PhCVl6Gl0UDhpy/f0oVbVT9gYWIGw6eFHDL5QJdUiBfnmElz2H2ljNp9GG+eAK2fw1OzsXxZQnjzcxZFV/1DgPX/VbABIwEgPo0XRiV/Jjwv4KKMViBumjJGFLrGtX3M2r7J9w3praeQBW+secRekUsoHISCQ==
+10.10.36.74 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAvYUXIfUpQwNWt5bGbfrkfvM9yL1XLWQAe6cMskeTErGxi576q2TsmgsNHro/7JOW8CLj7aqkQpFvFDkxxdpFumK3VM2Mgd7QJiDaGTcDYYZn595G+YfHnRWYHgkR09gkrRra3qEOeg/lBPvOmr6QVYhevUJZdem7odwBwmQ+IaU=
+2a02:2b88:2:1::270:0 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAw51frW/O9Pi2f775Vt8IOHXTl1N8s1lUNzZ7twUac1Fjn4/wpGBBbO+NaF7snjMIYdUdRdC6cuqISVs46SOysjO6DXvRuCnLS+96nzmf/rgmZkyfuhoerhQ7+mAXDb00Uoa6mdWUgaAGUEHd7lRdt3Ix2NnlFHVwb5oCbJV/t/pq25H+ADP6XT/Vv2qtaqJWRA/eSMAX84X0b/wdv+uXlWUlv5oo7VentLMncwqV/lYy3U4y8QnoU0NNDxMEj4fcoJVVEVUxgxTD/5ng5hwd5sfUdxHDenEli6zH5TjwENxRHqqoUFAOqBgVLkRBhwlyQgCQ3+mkw0nPA9bIZQXyrw==
+10.10.36.195 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAtdoF/ZcLMf1FuNY2XTChGu7ljckzv8VGyN+UwargQt+exqaEYC0twvl8YegfhgDshLok67mkTIs8IRKOhpe0gutIEIjhxnW7XOXwKeo+G/O41ObVQbDVYV/ERYrFFdS2zMRj4OqpitreNoCX3aL5k52aBVZq4hfVEOuji8mRjAIM4RJihIJZVghypKZP+frOWcMtoUPmNe6ZGBTOyowBm6nikvv0ZJ5N9rfrzk6WyFfj5i19Xhuzf6KjPkjckBm42xxslP7Au5p9FzNJd+icnVFvmSWozLJ3DUnSIK3tSs3+Pn/PVQDY60FYnyBIzRfYZVOoUMO6n0P/bi7wxkHXLw==
+to-beagle2.usersys.redhat.com,10.15.16.124 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCjdeUJfk5yVpND4ux9qPgSrOM+8znfYzAWOAbZI9kJbQyQUX3PvNKvohN7nwm8hYyeczwrs9JVvnMVGKK0R7hKijJrhiRJji6vHpyR7CaijbRn585qPdrFX3TMbRu+L/OTc/QLCXhjVVkwo/TXUDDVErYs9JF8Q0KWgkfevmz5Ii476lH0j+34y3Uerngsgr+d+MJSnfveEGYBPIyeC7MIEBnBbikm3MNHKSdnlirQPnGm66D5vNwA+4d8ktxAohf2q0IYz2moI3HVS99DsquCRharWf8UsuemAedfCtpBaUC2dXfWmupfWFf+xZKC58x06spmgq9+Hu5K63gbmf3x
+to-dreamplug2.usersys.redhat.com,10.15.16.153 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCjdeUJfk5yVpND4ux9qPgSrOM+8znfYzAWOAbZI9kJbQyQUX3PvNKvohN7nwm8hYyeczwrs9JVvnMVGKK0R7hKijJrhiRJji6vHpyR7CaijbRn585qPdrFX3TMbRu+L/OTc/QLCXhjVVkwo/TXUDDVErYs9JF8Q0KWgkfevmz5Ii476lH0j+34y3Uerngsgr+d+MJSnfveEGYBPIyeC7MIEBnBbikm3MNHKSdnlirQPnGm66D5vNwA+4d8ktxAohf2q0IYz2moI3HVS99DsquCRharWf8UsuemAedfCtpBaUC2dXfWmupfWFf+xZKC58x06spmgq9+Hu5K63gbmf3x
+nokia6,192.168.66.6 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAymbmbhdTSjG5/Ywcv1MxmocUPIOYVvNrLvK5afmHUaX01dEOgeRp9rOLvkuGotxHtnr5crH0gSzY07SL7silmOJsRaTMG3WPevZlDsehMCX7keSUgzZCZmoJDn8qS37L1xr//8AAuwyNh0VF7qhZSIbRib11YYcTsrxMplftPkV/ODF9ON3PfgVoSCn58ukWxmEmeb0n3aR2xRNAusB03L3K+eLtSY3lT00s2W8tr7LdMniRNkAMs8OU4+12y/5dqkB2G4RTig8nGgIrvNp7V4uvp46/XuwZUPeL/n16YqiuSas3fJOxRiK8pmMR0htRoZO1bTytw2dmbzJlsvEMBw==
+cvs.savannah.gnu.org,140.186.70.72 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAzFQovi+67xa+wymRz9u3plx0ntQnELBoNU4SCl3RkwSFZkrZsRTC0fTpOKatQNs1r/BLFoVt21oVFwIXVevGQwB+Lf0Z+5w9qwVAQNu/YUAFHBPTqBze4wYK/gSWqQOLoj7rOhZk0xtAS6USqcfKdzMdRWgeuZ550P6gSzEHfv0=
+fencepost.gnu.org,140.186.70.10 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAyYOoDcDRqVXXz5EdniJWnwSIoTiWS+1M9OpQeWlG4OYGpa9QAjJvn0wpaIsaFJ0XM28GSG4zzHySV5HS+PwqHoCbsJvwmOGbzYps6SqBXngL7gDXnIW2hZjMOpISCDSLbdQW9PBsD9VDJRgWF5MKWpEDc80GuQSWL0nxGzhwFkM=
+10.15.24.149 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCjdeUJfk5yVpND4ux9qPgSrOM+8znfYzAWOAbZI9kJbQyQUX3PvNKvohN7nwm8hYyeczwrs9JVvnMVGKK0R7hKijJrhiRJji6vHpyR7CaijbRn585qPdrFX3TMbRu+L/OTc/QLCXhjVVkwo/TXUDDVErYs9JF8Q0KWgkfevmz5Ii476lH0j+34y3Uerngsgr+d+MJSnfveEGYBPIyeC7MIEBnBbikm3MNHKSdnlirQPnGm66D5vNwA+4d8ktxAohf2q0IYz2moI3HVS99DsquCRharWf8UsuemAedfCtpBaUC2dXfWmupfWFf+xZKC58x06spmgq9+Hu5K63gbmf3x
+host2,192.168.66.2 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMwxsWoyLpPhVdu9rNB3whtw31W00N/8AyxF5rm6JeCJXgDZABRJVxJ3BLvg1ab2J21B7Pr6lgMkhhmNHzHzPG9hyhXnvx6zU58JLII4Mdh9IEp+X4HSut433kFZTP9DALRer8oseq8Kuc5FSbY3sw/v7bTUwSZ3UgbC4yx1+HUq3gYFpowvGqDz0huXJltXkdNKaf0Gmo7qQb8OAKgQjk3OqL9W9ii/WXzlWyI6oSUzbfiV9iD3M01E+x/01zIa6Hdx29U2zhyJVuEYdbWtJDjTZSYL2ZVuGMSS1cWg/twjxjbHOtcHdRJq7+Cq9YbhP3CAzkKdEsyHjyQbkFfvUT
diff --git a/.vimrc b/.vimrc
index 7cbb6c9..c9cb6c6 100644
--- a/.vimrc
+++ b/.vimrc
@@ -65,8 +65,10 @@ set nohlsearch
 set noincsearch
 set nofoldenable
 set fo=tcq1
-set textwidth=78
+"set textwidth=78
 set viminfo='100,\"1000,:100,/40
+let g:netrw_home = $HOME
+
 " FIXME: Learn how to do :tag instead of :tselect with :cstag (used by :tag and CTRL-] if set cst)
 set nocst
 set tags=./tags,./TAGS,./../tags,./../TAGS,./../../tags,./../../TAGS,./../../../tags,./../../../TAGS,./../../../../tags,./../../../../TAGS,./../../../../../tags,./../../../../../TAGS,./../../../../../../tags,./../../../../../../TAGS,./../../../../../../../tags,./../../../../../../../TAGS,./../../../../../../../../tags,./../../../../../../../../TAGS,./../../../../../../../../../tags,./../../../../../../../../../TAGS,./../../../../../../../../../../tags,./../../../../../../../../../../TAGS,./../../../../../../../../../../../tags,./../../../../../../../../../../../TAGS,./reactos/tags,./../reactos/tags,./../../reactos/tags,,./../../../reactos/tags,./../../../../reactos/tags,./../../../../../reactos/tags,./../../../../../../reactos/tags,./w32/inc/tags,./../w32/inc/tags,./../../w32/inc/tags,,./../../../w32/inc/tags,./../../../../w32/inc/tags,./../../../../../w32/inc/tags,./../../../../../../w32/inc/tags,./../../../../../../../w32/inc/tags,/usr/src/redhat/BUILD/tags,/usr/src/redhat/BUILD/TAGS,/usr/include/tags,/usr/include/TAGS
diff --git a/bin/build b/bin/build
index e1f00e2..c75eb56 100755
--- a/bin/build
+++ b/bin/build
@@ -20,9 +20,25 @@ I=Build
 # FIXME: Running tasks get broken.
 find $HOME/.hammock-result -mindepth 1 -maxdepth 1 -type d | xargs rm -rf
 
+function QUIT
+{
+  if [ -e ~/t/QUIT ];then
+    rm -f ~/t/QUIT
+    exit
+  fi
+}
+
 function run
 {
-  mockrun fedora-15-x86_64 "cd $PWD; $*"
+  QUIT
+  #mockrun fedora-rawhide-x86_64 "cd $PWD; $*"
+  mockrun fedora-16-x86_64 "cd $PWD; $*"
+}
+
+function hammock
+{
+  QUIT
+  (unset hammock; hammock "$@")
 }
 
 for i in gdb binutils;do
@@ -62,18 +78,18 @@ git pull
 ctags
 run make
 
-cd $HOME/redhat/archer-master
-git pull origin
-git pull gdb
+cd $HOME/redhat/gdb-master
+git fetch gdb
+git fetch archer
+git pull
 
-for i in 71 70;do
-	cd $HOME/redhat/gdb-master$i
-	git pull
-done
-
-for i in "" 72;do	# 71 70
-	cd $HOME/redhat/gdb-master$i
-	git pull
+#for i in 71 70;do
+#	cd $HOME/redhat/gdb-master$i
+#	git pull
+#done
+for i in "" 73 72 -nopython;do
+#	cd $HOME/redhat/gdb-master$i
+#	git pull
 
 	cd $HOME/redhat/gdb-clean$i
 	git pull
@@ -82,6 +98,31 @@ for i in "" 72;do	# 71 70
 	run make
 	rm -f gdb/gdb-clean
 	cp -p gdb/gdb gdb/gdb-clean
+
+	if [ "$i" != "${i#[0-9]}" ];then
+		new=gdb-cvs-master$i-new
+		cd $HOME/redhat
+		rm -rf $new
+		mkdir $new
+		cd $new
+		branch="gdb_$(echo $i|sed 's/^./&_/')-branch"
+		cvs -d :ext:jkratoch@sourceware.org:/cvs/src co -r $branch gdb
+		rc=$?
+		cd ..
+		if [ $rc -eq 0 -a "`echo $new/*`" = "$new/src" ];then
+			rm -rf gdb-cvs-master$i
+			mv $new/src gdb-cvs-master$i
+			rmdir $new
+		fi
+		cd $HOME/redhat/gdb-cvs-master$i
+		cvs update -r $branch
+		cd ..
+		rm -rf gdb-cvs-clean$i
+		cp -a gdb-cvs-master$i gdb-cvs-clean$i
+		cd gdb-cvs-clean$i
+		run errs12
+		ctags
+	fi
 done
 
 cd $HOME/redhat/gdb-clean-m32
@@ -106,7 +147,7 @@ mkdir $HOME/redhat/glibc-build
  run make install
  )
 
-for d in f15 f14 f13 rawhide;do
+for d in f16 f15 f14 rawhide;do
 	hammock -c fedoragdb -i $I-fedoragdb-$d -d $d
 done
 ### hammock -c fedoragdb -d rawhide --cd f12! -i $I-fedoragdb-f12-on-rawhide
@@ -117,25 +158,32 @@ cd
 for i in \
 	gdbcvs					\
 	binutilscvs				\
-	archer-jankratochvil-watchpoint2	\
+	archer-jankratochvil-watchpoint3	\
 	archer-jankratochvil-vla		\
 ; do
-	hammock -c $i -i $I-$i-f15 -d f15
+	hammock -c $i -i $I-$i-f16 -d f16
+	#hammock -c $i -i $I-$i-rawhide -d rawhide
 done
 #	archer-tromey-threaded-dwarf		\
 #	archer-tromey-python			\
 #	archer-pmuldoon-next-over-throw2	\
 #	archer-jankratochvil-ifunc		\
 
-for d in f15 f14 f13 rawhide;do
+for d in f16 f15 f14 rawhide;do
 	hammock -c gdbcvs -i $I-gdbcvs-$d -d $d
 done
 
-### for d in f13 f12;do
+hammock -c gdbcvs -i $I-gdbcvs-gdbindex-f16 -d f16 --gdbindex
+hammock -c gdbcvs -i $I-gdbcvs-gdbserver-f16 -d f16 --gdbserver
+hammock -c gdbcvs -i $I-gdbcvs-dwarf41-f16 -d f16 --dwarf=41
+hammock -c gdbcvs -i $I-gdbcvs-dwarf40-f16 -d f16 --dwarf=40
+#hammock -c gdbcvs -i $I-gdbcvs-dwarf4-gdbindex-f16 -d f16 --dwarf=4 --gdbindex
+
+### for d in f12;do
 ### 	hammock -c gdbcvs --branch gdb_7_1-branch -i $I-gdb71cvs-f12 -d f12
 ### done
 
-### for d in f13 rawhide rhel6;do
+### for d in rawhide rhel6;do
 ### for i in \
 ### 	gdbcvs					\
 ### 	archer-jankratochvil-fedora13		\
@@ -170,7 +218,7 @@ mkdir $HOME/redhat/${gcc}-build
 cd $HOME/redhat/${gcc}-build
 # gcc44+gcc45: sinput.adb:776:19: deallocation from empty storage pool
 # /usr/bin/ld: libbackend.a(graphite.o): undefined reference to symbol 'ppl_finalize' + /usr/bin/ld: note: 'ppl_finalize' is defined in DSO /usr/lib64/libppl_c.so.4 so try adding it to the linker command line
-run errs12 --origss -m ../${gcc}/configure --prefix=$root --disable-werror --enable-languages=c,c++,fortran,java$(test $gcc = gcchead -o $gcc = gcc46 && echo ,ada) $(test $gcc = gcc44 && echo --without-cloog) --with-ecj-jar=/usr/share/java/eclipse-ecj.jar
+run errs12 ../${gcc}/configure --prefix=$root --enable-languages=c,c++,fortran,java$(test $gcc = gcchead -o $gcc = gcc46 && echo ,ada) $(test $gcc = gcc44 && echo --without-cloog) --with-ecj-jar=/usr/share/java/eclipse-ecj.jar
 rm -rf $root
 mkdir $root
 run errs3 -j1
@@ -180,7 +228,7 @@ cd
 )
 done
 
-#hammock -c gdbcvs -i $I-gdbcvs-valgrind-f15 -d f15 --valgrind
+#hammock -c gdbcvs -i $I-gdbcvs-valgrind-rawhide -d rawhide --valgrind
 
 diffgdbdaymail
 
diff --git a/bin/dashtopatch b/bin/dashtopatch
index bab4561..c48fad6 100755
--- a/bin/dashtopatch
+++ b/bin/dashtopatch
@@ -1,25 +1,33 @@
 #! /bin/sh
 set -ex
+compile=false
+if [ "$1" = -c ];then
+  compile=true
+  shift
+fi
 if [ $# != 1 ] || ! echo "$1" | grep -q '-';then
   echo >&2 "Syntax: $0 branch-list-delimited-by-dashes"
   exit 1
 fi
-base="origin/master"
+base="gdb/master"
 gerrit=true
 if git branch -D gerrit;then
-  git checkout origin/master
+  git checkout gdb/master
   git checkout -b gerrit
 else
   gerrit=false
 fi
 for elem in $(echo "$1"|tr '-' ' ');do
-  if [ "$base" = "origin/master" ];then
+  if [ "$base" = "gdb/master" ];then
     next="$elem"
   else
     next="$base-$elem"
   fi
   git checkout "$next"
   git merge "$base"
+  if $compile;then
+    make
+  fi
   if [ -e "$next".patch ];then
     echo -e '/^--- /,$d\nw'|ed "$next".patch || :
   fi
diff --git a/bin/diffgdbday b/bin/diffgdbday
index 0e9f4f9..5fc9427 100755
--- a/bin/diffgdbday
+++ b/bin/diffgdbday
@@ -9,7 +9,7 @@ TODAY=`date -d "$WHEN" +%Y%m%d`
 YESTERDAY=`date -d "$TODAY - 1 day" +%Y%m%d`
 cd $HOME/hammock
 #for THIS in ${TODAY}Build-{gdbcvs,fedoragdb}*;do 
-for THIS in ${TODAY}Build-gdbcvs*;do 
+for THIS in ${TODAY}Build-{gdb,binutils}cvs*;do 
   PREV=$YESTERDAY`echo $THIS|sed 's/^........//'`
   diffgdbdir "$@" $PREV $THIS
 done
diff --git a/bin/diffgdbdir b/bin/diffgdbdir
index 2f2ab2d..ad10958 100755
--- a/bin/diffgdbdir
+++ b/bin/diffgdbdir
@@ -1,6 +1,7 @@
 #! /bin/sh
 
 x="*.log"
+x2="foobar"
 o=""
 while true;do
 	if [ "$1" = "-r" ];then
@@ -19,6 +20,11 @@ while true;do
 		shift
 		continue
 	fi
+	if [ "$1" = "pie" ];then
+		x2="*pie*"
+		shift
+		continue
+	fi
 	break
 done
 
@@ -36,7 +42,7 @@ function diffitraw
 		echo "MISSING: $dir1 $dir2"
 		return
 	fi
-	diffgdb $o -x rpm-qa -x "$x" $dir1 $dir2
+	diffgdb $o -x rpm-qa -x "$x" -x "$x2" $dir1 $dir2
 	diffed=true
 }
 function diffit
@@ -91,5 +97,6 @@ if [ "$1" != "${1#tests/}" -a -d $1 ];then
 	diffed=true
 fi
 if ! $diffed;then
-	echo "NOT FOUND: $1 $2"
+	diffitraw $1 $2
+	#echo "NOT FOUND: $1 $2"
 fi
diff --git a/bin/errs12 b/bin/errs12
index 1217a17..e7c7e07 100755
--- a/bin/errs12
+++ b/bin/errs12
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 # $Id$
 
 renice +19 -p $$; ionice -c3 -p $$
diff --git a/bin/git-bisect-run b/bin/git-bisect-run
index ae225fc..2e12e2f 100755
--- a/bin/git-bisect-run
+++ b/bin/git-bisect-run
@@ -3,16 +3,19 @@
 
 set -ex
 test -n "$*"
-trap 'git reset --hard;git clean -df;exit 125' EXIT
+trap 'sleep 0;git reset --hard;git clean -dfx;exit 125' EXIT
+git reset --hard
+git clean -dfx
+# patch -p1 <~/t/bisect.patch || :
+errs12 -s --fast --disable-werror --without-python --disable-plugins --disable-gdbserver --disable-gold
+#errs12 -s --fast --disable-gold
 git reset --hard
-git clean -df
-errs12 -s --fast --disable-werror --without-python --disable-plugins
 trap '' EXIT
 set +e
 "$@" 
 rc=$?
 set -e
 #git reset --hard
-#git clean -df
+#git clean -dfx
 echo rc=$rc
 exit $rc
diff --git a/bin/hammock b/bin/hammock
index 70de9cc..8844203 100755
--- a/bin/hammock
+++ b/bin/hammock
@@ -9,7 +9,7 @@ my $start=time();
 
 my $gdbcvsmaster=$ENV{"HOME"}."/redhat/gdb-cvs-master";
 my $binutilscvsmaster=$ENV{"HOME"}."/redhat/binutils-cvs-master";
-my $archermaster=$ENV{"HOME"}."/redhat/archer-master";
+my $archermaster=$ENV{"HOME"}."/redhat/gdb-master";
 my $fedoragitroot=q{git://pkgs.fedoraproject.org};
 #Unknown host cvs.devel.redhat.com.
 #my $rhelcvsroot=q{:pserver:anonymous:@cvs.devel.redhat.com:/cvs/dist};
@@ -52,6 +52,9 @@ my $gdbserver;
 my $valgrind;
 my $gdbindex;
 my $dwarf;
+# Use --dwarf=40 for: --dwarf=4 -fno-debug-types-section
+# Use --dwarf=41 for: --dwarf=4    -fdebug-types-section
+my $debug_types_section;
 my $orphanripper=1;
 die if !GetOptions(
   "i|userid=s"=>\$userid,
@@ -95,6 +98,8 @@ $gdbserver and $component ne "gdbcvs" and die "--gdbserver is available only for
 $valgrind and $component ne "gdbcvs" and die "--valgrind is available only for gdbcvs";
 $gdbserver and $valgrind and die "--gdbserver and --valgrind are mutually exclusive";
 ($gdbserver || $valgrind) and $gdbindex and die "--gdbserver|--valgrind and --gdbindex are mutually exclusive";
+do { $debug_types_section=0; $dwarf=4; } if ($dwarf||0)==40;
+do { $debug_types_section=1; $dwarf=4; } if ($dwarf||0)==41;
 !defined $dwarf or ($dwarf>=2 && $dwarf<=4) or die "--dwarf requires DWARF version number";
 ($gdbserver || $valgrind || $gdbindex) and $dwarf and die "--gdbserver|--valgrind|--gdbindex and --dwarf are mutually exclusive";
 $orphanripper=($orphanripper?"orphanripper":"");
@@ -216,7 +221,7 @@ sub writefile
 }
 
 # /etc/cgconfig.conf
-spawn "echo cgclassify -g '*':hammock $$ || :";
+spawn "cgclassify -g '*':hammock $$ || :";
 
 spawn "renice +19 -p $$";
 spawn "ionice -c3 -p $$";
@@ -241,6 +246,7 @@ my %dump=(
   "valgrind"=>$valgrind,
   "gdbindex"=>$gdbindex,
   "dwarf"=>$dwarf,
+  "debug_types_section"=>$debug_types_section,
   "orphanripper"=>$orphanripper,
 );
 while (my($name,$val)=each(%dump)) {
@@ -305,7 +311,7 @@ while (@distrouse || keys(%child)) {
     my $gitrepo;
     if ($component=~/^fedora(.*)$/) {
       $gitrepo=$1;
-      $gitbranch="f$1/master" if $componentdistro=~/^fedora-(\d+)$/;
+      $gitbranch="f$1" if $componentdistro=~/^fedora-(\d+)$/;
       $gitbranch="master" if $componentdistro=~/^fedora-rawhide$/;
       die "$component vs. $componentdistro" if !$gitbranch;
       $gitroot=$fedoragitroot;
@@ -456,10 +462,20 @@ while (@distrouse || keys(%child)) {
       if ($component eq "binutilscvs") {
 	mockrun "cd $baretestsuite; $errs12; ulimit -c unlimited; $orphanripper make -k check || :; ".q{for file in {gas/testsuite/gas,ld/ld,binutils/binutils}.{sum,log};do ln $file}." $out/binutils-$distro-".q{$(basename $file) || :; done;};
       } else {
+	if ($valgrind) {
+	  # FIXME
+	  do { unlink $_ or warn "$_: $!"; } for "$baretestsuite/gdb/testsuite/gdb.base/break-interp.exp";
+	}
 	my @check=($distro=~/-x86_64/ ? qw(-m64 -m32) : -m32);
 	@check=map("check//unix/$_",@check);
 	@check=map({($_,"$_/-fPIE/-pie");} @check) if $gdbcvspie;
 	# for i in ".join(" ",@check).";do $orphanripper make -k \$i || :;done
+	sub runtestcc($)
+	{
+	  local($_)=@_;
+	  s/ /\\ /g;
+	  return ' RUNTESTFLAGS="CC_FOR_TARGET=gcc\ '.$_.' CXX_FOR_TARGET=g++\ '.$_.'"'
+	}
 	mockrun "cd $baretestsuite;"
 		.(!$valgrind?"":' HAMMOCK_VALGRIND=1')
 		." $errs12"
@@ -473,7 +489,7 @@ while (@distrouse || keys(%child)) {
 		.(!$gdbserver?"":' RUNTESTFLAGS=--target_board=native-gdbserver')
 		.(!$valgrind?"":' RUNTESTFLAGS=--target_board=valgrind')
 		.(!$gdbindex?"":' RUNTESTFLAGS="CC_FOR_TARGET=/bin/sh\ $PWD/cc-with-index.sh\ gcc CXX_FOR_TARGET=/bin/sh\ $PWD/cc-with-index.sh\ g++"')
-		.(!$dwarf?"":' RUNTESTFLAGS="CC_FOR_TARGET=gcc\ -gdwarf-'.$dwarf.'\ -g0 CXX_FOR_TARGET=g++\ -gdwarf-'.$dwarf.'\ -g0"')
+		.(!$dwarf?"":runtestcc "-gdwarf-$dwarf".(!defined $debug_types_section?"":'\ '.($debug_types_section?"-fdebug-types-section":"-fno-debug-types-section"))." -g0")
 		.(!$parallel?"":' FORCE_PARALLEL=1')
 		." || :; ".q{for t in sum log;do for file in testsuite*/gdb.$t;do suffix="${file#testsuite.unix.}"; suffix="${suffix%/gdb.$t}"; ln $file}." $out/gdb".q{$suffix.$t || :; done; done;};
       }
diff --git a/bin/mutt_ldap_query b/bin/mutt_ldap_query
index d056b9d..84c018a 100755
--- a/bin/mutt_ldap_query
+++ b/bin/mutt_ldap_query
@@ -9,7 +9,8 @@
 query=$1;
 
 #ldap_server="-h ldap.stuttgart.redhat.com"
-ldap_server="-H ldap://127.0.0.1:3389"
+#ldap_server="-H ldap://127.0.0.1:3389"
+ldap_server="-H ldap://ldap.str.redhat.com:389"
 search_base="dc=redhat,dc=com"
 
 echo
diff --git a/bin/rpmmerge b/bin/rpmmerge
index 39fb27d..c61a6b7 100755
--- a/bin/rpmmerge
+++ b/bin/rpmmerge
@@ -17,7 +17,7 @@ for base in $l;do
 	# The old `-orig' format should be converted by:
 	# rpm -qla|perl -lne 'chomp;s/$/-orig/;next if ! -e;$o=$_;$o=~s/-orig$//;$o=~tr{/}{-};$o="/root/rpmmerge/$o";die $o if -e $o;$_="mv -f '\''$_'\'' '\''$o'\''";system $_ and die "$_: $!";'
 
-	orig="/root/rpmmerge/$(echo $base|tr / -)"
+	orig="/root/rpmmerge/$base"
 
 	if test ! -f $orig
 	then
@@ -54,7 +54,7 @@ done
 if $ok
 then
 	mkdir -p /root/rpmmerge
-	rpm -qac|perl -ne 'chomp;next if $_ eq "(contains no files)";next if m{^/var/lib/rpm/};next if $_ eq "/usr/lib/locale/locale-archive";next if ! -f $_;$o=$_;$o=~tr{/}{-};$o="/root/rpmmerge/$o";next if -e $o;system "cp -i -p '\''$_'\'' '\''$o'\''" and die "$_: $!";'
+	rpm -qac|perl -ne 'chomp;next if $_ eq "(contains no files)";next if m{^/var/lib/rpm/};next if $_ eq "/usr/lib/locale/locale-archive";next if ! -f $_;$o=$_;$o="/root/rpmmerge/$o";next if -e $o;$od=$o;$od=~s{[^/]*$}{};system "mkdir -p '\''$od'\''" and die "dir $_: $!";system "cp -i -p '\''$_'\'' '\''$o'\''" and die "$_: $!";'
 
 	echo OK
 else
diff --git a/bin/runtest-dwarf2 b/bin/runtest-dwarf2
new file mode 100755
index 0000000..10a47ec
--- /dev/null
+++ b/bin/runtest-dwarf2
@@ -0,0 +1,2 @@
+#! /bin/sh
+exec runtest CC_FOR_TARGET="gcc -gdwarf-2 -g0" CXX_FOR_TARGET="g++ -gdwarf-2 -g0" "$@"
diff --git a/bin/runtest-dwarf3 b/bin/runtest-dwarf3
new file mode 100755
index 0000000..1b87889
--- /dev/null
+++ b/bin/runtest-dwarf3
@@ -0,0 +1,2 @@
+#! /bin/sh
+exec runtest CC_FOR_TARGET="gcc -gdwarf-3 -g0" CXX_FOR_TARGET="g++ -gdwarf-3 -g0" "$@"
diff --git a/bin/runtest-dwarf4 b/bin/runtest-dwarf4
new file mode 100755
index 0000000..1e726c4
--- /dev/null
+++ b/bin/runtest-dwarf4
@@ -0,0 +1,2 @@
+#! /bin/sh
+exec runtest CC_FOR_TARGET="gcc -gdwarf-4 -g0" CXX_FOR_TARGET="g++ -gdwarf-4 -g0" "$@"
diff --git a/bin/runtest-dwarf40 b/bin/runtest-dwarf40
new file mode 100755
index 0000000..39010fb
--- /dev/null
+++ b/bin/runtest-dwarf40
@@ -0,0 +1,2 @@
+#! /bin/sh
+exec runtest CC_FOR_TARGET="gcc -gdwarf-4 -fno-debug-types-section -g0" CXX_FOR_TARGET="g++ -gdwarf-4 -fno-debug-types-section -g0" "$@"
diff --git a/bin/runtest-dwarf41 b/bin/runtest-dwarf41
new file mode 100755
index 0000000..44d2169
--- /dev/null
+++ b/bin/runtest-dwarf41
@@ -0,0 +1,2 @@
+#! /bin/sh
+exec runtest CC_FOR_TARGET="gcc -gdwarf-4 -fdebug-types-section -g0" CXX_FOR_TARGET="g++ -gdwarf-4 -fdebug-types-section -g0" "$@"
diff --git a/bin/runtest-gdbindex b/bin/runtest-gdbindex
new file mode 100755
index 0000000..3a14709
--- /dev/null
+++ b/bin/runtest-gdbindex
@@ -0,0 +1,3 @@
+#! /bin/sh
+exec runtest CC_FOR_TARGET=/bin/sh\ $PWD/../cc-with-index.sh\ gcc CXX_FOR_TARGET=/bin/sh\ $PWD/../cc-with-index.sh\ g++ "$@"
+
diff --git a/bin/runtest-gdbindex-m32 b/bin/runtest-gdbindex-m32
new file mode 100755
index 0000000..9636891
--- /dev/null
+++ b/bin/runtest-gdbindex-m32
@@ -0,0 +1,3 @@
+#! /bin/sh
+exec runtest CC_FOR_TARGET=/bin/sh\ $PWD/../cc-with-index.sh\ gcc\ -m32 CXX_FOR_TARGET=/bin/sh\ $PWD/../cc-with-index.sh\ g++\ -m32 "$@"
+
diff --git a/bin/runtest-gdbserver-pie b/bin/runtest-gdbserver-pie
new file mode 100755
index 0000000..2157eea
--- /dev/null
+++ b/bin/runtest-gdbserver-pie
@@ -0,0 +1,2 @@
+#! /bin/sh
+DEJAGNU=$HOME/src/runtest-gdbserver/site.exp runtest CC_FOR_TARGET="gcc -fPIE -pie" CXX_FOR_TARGET="g++ -fPIE -pie"  --target_board native-gdbserver "$@"
diff --git a/bin/runtest-gdbserver-read1 b/bin/runtest-gdbserver-read1
new file mode 100755
index 0000000..a29af43
--- /dev/null
+++ b/bin/runtest-gdbserver-read1
@@ -0,0 +1,3 @@
+#! /bin/sh
+export EXPECT=$HOME/bin/expect-read1
+exec runtest "$@"
diff --git a/bin/runtest-m31 b/bin/runtest-m31
index 0b4bfbe..6d2a17c 100755
--- a/bin/runtest-m31
+++ b/bin/runtest-m31
@@ -1,2 +1,2 @@
 #! /bin/sh
-exec runtest --target_board unix/-m31 "$@"
+exec runtest CC_FOR_TARGET="gcc -m31" CXX_FOR_TARGET="g++ -m31" "$@"
diff --git a/bin/runtest-m31-pie b/bin/runtest-m31-pie
index 889b323..1c1d89f 100755
--- a/bin/runtest-m31-pie
+++ b/bin/runtest-m31-pie
@@ -1,2 +1,2 @@
 #! /bin/sh
-exec runtest --target_board unix/-m31/-fPIE/-pie "$@"
+exec runtest CC_FOR_TARGET="gcc -m31 -fPIE -pie" CXX_FOR_TARGET="g++ -m31 -fPIE -pie" "$@"
diff --git a/bin/runtest-m32 b/bin/runtest-m32
index f09a6c5..b1a584f 100755
--- a/bin/runtest-m32
+++ b/bin/runtest-m32
@@ -1,2 +1,2 @@
 #! /bin/sh
-exec runtest --target_board unix/-m32 "$@"
+exec runtest CC_FOR_TARGET="gcc -m32" CXX_FOR_TARGET="g++ -m32" "$@"
diff --git a/bin/runtest-m32-dwarf3 b/bin/runtest-m32-dwarf3
new file mode 100755
index 0000000..83112c4
--- /dev/null
+++ b/bin/runtest-m32-dwarf3
@@ -0,0 +1,2 @@
+#! /bin/sh
+exec runtest CC_FOR_TARGET="gcc -m32 -gdwarf-3 -g0" CXX_FOR_TARGET="g++ -m32 -gdwarf-3 -g0" "$@"
diff --git a/bin/runtest-m32-dwarf4 b/bin/runtest-m32-dwarf4
new file mode 100755
index 0000000..48bd8f3
--- /dev/null
+++ b/bin/runtest-m32-dwarf4
@@ -0,0 +1,2 @@
+#! /bin/sh
+exec runtest CC_FOR_TARGET="gcc -m32 -gdwarf-4 -g0" CXX_FOR_TARGET="g++ -m32 -gdwarf-4 -g0" "$@"
diff --git a/bin/runtest-m32-dwarf40 b/bin/runtest-m32-dwarf40
new file mode 100755
index 0000000..5136888
--- /dev/null
+++ b/bin/runtest-m32-dwarf40
@@ -0,0 +1,2 @@
+#! /bin/sh
+exec runtest CC_FOR_TARGET="gcc -m32 -gdwarf-4 -fno-debug-types-section -g0" CXX_FOR_TARGET="g++ -m32 -gdwarf-4 -fno-debug-types-section -g0" "$@"
diff --git a/bin/runtest-m32-dwarf41 b/bin/runtest-m32-dwarf41
new file mode 100755
index 0000000..7620527
--- /dev/null
+++ b/bin/runtest-m32-dwarf41
@@ -0,0 +1,2 @@
+#! /bin/sh
+exec runtest CC_FOR_TARGET="gcc -m32 -gdwarf-4 -fdebug-types-section -g0" CXX_FOR_TARGET="g++ -m32 -gdwarf-4 -fdebug-types-section -g0" "$@"
diff --git a/bin/runtest-m32-pie b/bin/runtest-m32-pie
index 4a265c2..565742d 100755
--- a/bin/runtest-m32-pie
+++ b/bin/runtest-m32-pie
@@ -1,2 +1,2 @@
 #! /bin/sh
-exec runtest --target_board unix/-m32/-fPIE/-pie "$@"
+exec runtest CC_FOR_TARGET="gcc -m32 -fPIE -pie" CXX_FOR_TARGET="g++ -m32 -fPIE -pie" "$@"
diff --git a/bin/runtest-m64 b/bin/runtest-m64
index 453cf06..1077cdb 100755
--- a/bin/runtest-m64
+++ b/bin/runtest-m64
@@ -1,2 +1,2 @@
 #! /bin/sh
-exec runtest --target_board unix/-m64 "$@"
+exec runtest CC_FOR_TARGET="gcc -m64" CXX_FOR_TARGET="g++ -m64" "$@"
diff --git a/bin/runtest-m64-pie b/bin/runtest-m64-pie
index f6872bf..410ea25 100755
--- a/bin/runtest-m64-pie
+++ b/bin/runtest-m64-pie
@@ -1,2 +1,2 @@
 #! /bin/sh
-exec runtest --target_board unix/-m64/-fPIE/-pie "$@"
+exec runtest CC_FOR_TARGET="gcc -m64 -fPIE -pie" CXX_FOR_TARGET="g++ -m64 -fPIE -pie" "$@"
diff --git a/bin/runtest-read1 b/bin/runtest-read1
new file mode 100755
index 0000000..3fe5234
--- /dev/null
+++ b/bin/runtest-read1
@@ -0,0 +1,3 @@
+#! /bin/sh
+export EXPECT=$HOME/bin/expect-read1
+exec runtest-gdbserver "$@"
diff --git a/bin/runtest-stabs b/bin/runtest-stabs
index 00644f5..c60ba25 100755
--- a/bin/runtest-stabs
+++ b/bin/runtest-stabs
@@ -1,2 +1,2 @@
 #! /bin/sh
-runtest --target_board=unix/gdb:debug_flags=-gstabs+ "$@"
+exec runtest CC_FOR_TARGET="gcc -gstabs+ -g0" CXX_FOR_TARGET="g++ -gstabs+ -g0" "$@"
diff --git a/bin/runtest-stabs-m32 b/bin/runtest-stabs-m32
new file mode 100755
index 0000000..1f822df
--- /dev/null
+++ b/bin/runtest-stabs-m32
@@ -0,0 +1,2 @@
+#! /bin/sh
+exec runtest CC_FOR_TARGET="gcc -m32 -gstabs+ -g0" CXX_FOR_TARGET="g++ -m32 -gstabs+ -g0" "$@"
diff --git a/bin/runtest-ugdb b/bin/runtest-ugdb
new file mode 120000
index 0000000..1f8a024
--- /dev/null
+++ b/bin/runtest-ugdb
@@ -0,0 +1 @@
+../src/runtest-ugdb/runtest-ugdb
\ No newline at end of file
diff --git a/bin/runtest-valgrind b/bin/runtest-valgrind
new file mode 120000
index 0000000..b5f19bc
--- /dev/null
+++ b/bin/runtest-valgrind
@@ -0,0 +1 @@
+../src/runtest-valgrind/runtest-valgrind
\ No newline at end of file
diff --git a/bin/runtest-writew b/bin/runtest-writew
new file mode 100755
index 0000000..71c9b0f
--- /dev/null
+++ b/bin/runtest-writew
@@ -0,0 +1,3 @@
+#! /bin/sh
+export EXPECT=$HOME/bin/expect-writew
+exec runtest "$@"
diff --git a/src/gdb-io b/src/gdb-io
index 10152a5..6e28371 100755
--- a/src/gdb-io
+++ b/src/gdb-io
@@ -9,9 +9,9 @@ mkdir -p $DIR
 i=0
 while true;do
 	FILE=$DIR/`printf %02d $i`
-	if ! test -f $FILE;then
+	if ! test -f $FILE.in;then
 		break
 	fi
 	i=$[$i+1]
 done
-tee $FILE.in | "$0"-orig "$@" | tee $FILE.out
+if [ "$*" != --version ];then tee $FILE.in;fi | "$0"-orig "$@" | tee $FILE.out