Thorsten Glaser: New mksh and jupp releases, mksh FAQ, jupprc for JOE 4.4; MuseScore

- source tarballs
- Win32 binaries
- DOS binaries
- drop-in jupprc for JOE 2.8, or to update jupp 2.8
- drop-in jupprc for JOE 3.7
- drop-in jupprc for JOE 4.4
To summarise: you re on the top level of a checkout of the project into which the other project (Bproject) is to be merged. We wish to merge the top level of Bproject s master branch as (newly created) subdirectory dir-B under the current project s top level.
Bproject /path/to/B/.git $ git merge -s ours --allow-unrelated-histories --no-commit Bproject/master $ git read-tree -u --prefix=dir-B/ Bproject/master $ git commit -m 'Merge B project as our subdirectory dir-B' Later updates are easy: $ git pull -s subtree Bproject master$ git remote add --no-tags -f
(mind the trailing slash after dir-B/ on the read-tree command!) Besides reformatting, the use of --allow-unrelated-histories recently became necessary. --no-tags is also usually what you want, because tags are not namespaced like branches.
Another command you might find relevant is how to clean up orphaned remote branches:
$ for x in $(git remote); do git remote prune "$x"; done
This command locally deletes all remote branches (those named origin/foo ) that have been deleted on the remote side. Update: Natureshadow wishes you to know that there is such a command as git subtree which can do similar things to the subtree merge strategy explained above, and several more related things. It does, however, need the pr fix on every subsequent pull.
pageok
Ugh. Oh well, PocketIE doesn t provide a View Source thingy, so I asked Natureshadow (who got the same result on his Android, and had no View Source either apparently, so he used cURL to see it). We saw (here, re-enacted using ftp(1)):
tg@blau:~ $ ftp -Vo - http://www.draitschbrunnen.de/ <!-- pageok --> <!-- managed by puppet --> <html> <pre>pageok</pre> </html>
This is the final straw after puppet managed to trash a sudoers(5) at work (I warned people to not introduce it) now it breaks websites.
(Of course, tools are useful, but
at best to the skill of their users. Merely dumbly copying
recipes from the net without any understanding just makes
debugging harder for those of us with skills.)
ObQuestion: Does anyone have a transcript (into UTF-8)
and a translation for the other half of the OpenBSD
2.8 poster? (I get asked this regularily.)
Update: One person sent me the Kanji
and Kana for it in UTF-8 ,
and they and one more person told me it s Hands off my
machine! or Don t lay a hand on my machine! . Now I m
not studying Japanese, but it LGTM in FixedMisc [MirOS],
and JMdict from MirPorts says: ore no mashin ni te (w)o
dasu na (roughly: my machine; particle; hands; particle;
put out; prohibition) Thanks all, now I know what to
tell visitors who wonder about that poster on my wall.
ObTip: I can install a few hundred Debian VMs at work
manually before the effort needed to automate d-i would
amortise. So I decided not to. Coworkers are shocked. I
keep flexibility (can decide to have machines differ),
and the boss accepts my explanations. Think before doing
automation just for the sake of automation!
The following entertainment
tg@blau:~ $ echo foo >/bar\ baz /bin/mksh: can't create /bar baz: Permission denied 1 tg@blau:~ $ doch tg@blau:~ $ cat /bar\ baz foo
was provided by Tonnerre Lombard; like Swedish, German has got a number of words that cannot be expressed in English so I feel not up to the task of explaining this to people who don t know the German word doch , just rest assured it calls the last input line (be careful, this is literally a line, so don t use backslash-newline sequences) using sudo(8).
Tracking down the problem, this can be reduced to the following configuration (minimised, to show the problem) in /etc/apache2/sites-enabled/1one:
<VirtualHost *:443> ServerName wiki-70.lan.tarent.de RedirectMatch permanent . https://evolvis-70.lan.tarent.de/ SSLEngine on SSLCertificateFile /etc/ssl/W_lan_tarent_de.cer SSLCertificateKeyFile /etc/ssl/private/W_lan_tarent_de.key SSLCertificateChainFile /etc/ssl/godaddy.ca </VirtualHost>
Do not mind the actual content, this is a very stripped-down demo on a not-actually-set-up-yet box.
Same is valid for the companion configuration file /etc/apache2/sites-enabled/2two:
NameVirtualHost *:443 <VirtualHost *:443> ServerName evolvis-70.lan.tarent.de SSLEngine on # workaround for BEAST (CVE-2011-3389), short-term SSLCipherSuite RC4-SHA SSLCertificateFile /etc/ssl/W_lan_tarent_de.cer SSLCertificateKeyFile /etc/ssl/private/W_lan_tarent_de.key SSLCertificateChainFile /etc/ssl/godaddy.ca SSLProtocol TLSv1 </VirtualHost>
Turns out the BEAST workaround was at fault here: the differing SSLCipherSuites between the vhosts (on the same Legacy IP / TCP Port tuple, as we use Wildcard SSL Certificates) made Apache 2 want to renegotiate, so either commenting it on 2two or, better, adding it to 1one helped. Interestingly enough, the SSLProtocol directive did not matter (in my tests). So, keep SSL settings synchronised between vhosts. In fact, those were already from include files, but 2two was from the Evolvis 5 generation, whereas we added to 1one an Include of the httpd.ssl1.inc file generated by the previous releases of EvolvisForge and had not switched those legacy vhosts to the new configuration, as everything worked on lenny. This wlog entry brought to you by the system administrators of tarent solutions GmbH and the Evolvis Project, based on FusionForge.