Log for #openttdcoop.devzone on 5th April 2011:
Times are UTC Toggle Colours
00:04:36  *** KenjiE20 has quit IRC
05:23:56  *** supermop has quit IRC
06:16:48  <Brot6> Nutracks - Feature #2498: Medium speed track GFX (planetmaker) @
06:39:59  <Brot6> CHIPS Station Set - Revision 113:f1371454ed74: Change: set string for Parcels Office; provide add... (andythenorth) @
07:35:04  <Brot6> OpenGFX - Revision 629:86a5e77c2422: Change: Use NML-templates also for the tropical engines and ... (planetmaker) @
09:21:38  <Brot6> Example NewGRF Project - Feature Request #2499 (New): new bundle compression xz (Ammler) @
09:42:33  <Brot6> 2cc train set - Feature #56: rework region availability parameter (Purno) @
10:44:22  *** SmatZ- is now known as SmatZ
11:12:40  <Ammler> planetmaker:
11:12:56  <Ammler> based on opengfx
11:21:25  <Ammler> btw. what does the m mean on dep_check mdep?
11:21:33  <Ammler> why not pydep?
11:25:18  <Ammler> [XZ] opengfx-nightly-r623M-source.tar.xz
11:25:20  <Ammler> xz: opengfx-nightly-r623M-source.tar.xz: File exists
11:25:21  <Ammler> make: *** [opengfx-nightly-r623M-source.tar.xz] Error 1
11:25:34  <Ammler> why do I get that? I have opengfx-nightly-r623M-source.tar.xz defined as target
11:25:51  <Ammler> $(DIR_NAME_SRC).tar.xz: $(DIR_NAME_SRC).tar
11:29:09  <planetmaker> I can't check the patch here right now, no xz installed.
11:29:28  <planetmaker> and mdep... dunno anymore :-)
11:29:47  <planetmaker> probably like "my dep script"
11:31:11  <Ammler> bad :-P
11:31:14  <Ammler> I know why
11:31:16  <Ammler> phony
11:31:33  <V453000> why do I have the feeling like there are more @#$^% characters than alphabet letters? :D
11:31:34  <planetmaker> hm, no, I don't think so
11:32:05  <planetmaker> V453000, there are 255 ASCII characters. and only 2*26 = 52 letters. So quite true
11:32:14  <V453000> :p
11:32:40  <planetmaker> even with 7 bit = 127 characters it's nearly true
11:32:43  <V453000> cant say I expected to understand it anyway :)
11:36:11  <Ammler> planetmaker: not .PHONY?
11:36:42  <planetmaker> bundle_xz needs to be phony
11:38:15  <Ammler> but it doesn't solve the file exist issue
11:38:44  <planetmaker> does that file actually exist?
11:38:50  <Ammler> yes
11:38:57  <planetmaker> i.e. can xz not overwrite that file?
11:39:00  <Ammler> I run "make bundle_xz" and then again
11:39:14  <planetmaker> maybe that needs other parameters then
11:39:22  <Ammler> ah
11:39:42  <Ammler> make bundle_zip does overwrite the file, if it exists?
11:39:55  <planetmaker> and if the tar is newer. Sure
11:40:10  <planetmaker> zip just overwrites by default. Maybe xz doesn't
11:40:22  <Ammler> it doesn't
11:40:27  <planetmaker> there you go :-)
11:40:34  <Ammler> but in that case it isn't needed
11:40:43  <planetmaker> you need to set flags such that things get overwritten without notice
11:40:46  <Ammler> if I run make bundle_xz twice without change between
11:41:04  <Ammler> oh
11:41:05  <Ammler> I see
11:41:14  <Ammler> the tar is gone
11:41:24  <planetmaker> it should re-create the tar then
11:41:32  <Ammler> and so of course it "has" changed
11:41:44  <Ammler> at least for the makefile
11:41:44  <planetmaker> yes, that's deleted IIRC
11:41:49  <planetmaker> yes
11:41:50  <Ammler> not deleted
11:42:14  <Ammler> if you "gzip/xz something.tar" it does compress that file
11:42:18  <Ammler> so the file is gone
11:42:26  <planetmaker> -	$(_V) $(TAR) $(TAR_FLAGS) $(DIR_NAME_SRC).tar $(DIR_NAME_SRC)
11:42:57  <Ammler> that is why I moved tar out of  $(DIR_NAME_SRC)
11:43:24  <planetmaker> oh, does gzip do that?
11:43:25  <Ammler> slowly, makefile is going to make sense :-)
11:44:05  <planetmaker> :-)
11:44:32  <Ammler> that is why you use -f for bzip2
11:45:15  <planetmaker> probably :-)
11:45:29  * planetmaker checks... yes
11:45:42  <Ammler> and I sort the .PHONY words
11:46:01  <Ammler> echo "clean mrproper distclean test all depend bundle bundle_src bundle_zip bundle_tar bundle_bzip docs check addcheck" | tr ' ' '\n' | sort | tr '\n' ' '
11:46:40  <planetmaker> what's that?
11:46:52  <Ammler> I didn't find a option for sort to do that :-)
11:46:59  <planetmaker> ah
11:47:41  <Ammler> so you think, better use -f than make a copy of the tar?
11:48:36  <planetmaker> well. you could skip the tar, if xz eats a full dir directly and doesn't then spit out a chain of compressed files but a single file
11:48:52  <Ammler> at least easier to implement
11:49:20  <planetmaker> though tar'ing first and then xz'ing might result in slightly better compression.
11:49:25  <Ammler> you could use tar directly
11:50:18  <planetmaker> quite true
11:50:22  <Ammler> I can test
11:50:53  <planetmaker> might be better. Though when we pack it multiple times it might be more efficient to re-use the existing tar
11:51:25  <planetmaker> But I don't care much either way. It's not time critical
11:51:36  <planetmaker> And it "just" needs one way which works reliably
11:52:08  <Ammler> you don't have the compression rates for tar
11:52:19  <Ammler> so you have indeed better compression
11:52:33  <planetmaker> which way?
11:52:36  <Ammler> xz -e isn't possible with tar
12:12:42  <Ammler> planetmaker: the question is, do you want to overwrite?
12:13:15  <Ammler> this would work: cat das.tar | xz -e > das.tar.xz
12:13:35  <Ammler> ">" does overwrite
12:13:53  <Ammler> and keep the tar
12:14:47  *** ODM has joined #openttdcoop.devzone
12:15:22  *** DanMacK has joined #openttdcoop.devzone
12:19:32  *** KenjiE20 has joined #openttdcoop.devzone
12:19:35  <Ammler> omg, there is "-k"
12:21:00  <planetmaker> Ammler, it needs to overwrite
12:21:25  <Ammler> xz -e -k does the job :-)
12:21:27  <planetmaker> bundle_xz; modify a source file. bundle_xz
12:21:35  <Ammler> and -f
12:21:37  <planetmaker> it would need to overwrite and clean wasn't called
12:22:22  <Ammler> would you keep all options in the Makefile.def or just those which need to be customizeable
12:22:47  <Ammler> -kf should always be used
12:23:02  <Ammler> so I "hardcode" those 2, right?
12:23:03  *** DayDreamer has joined #openttdcoop.devzone
12:23:06  <planetmaker> ok
12:23:32  <Ammler> hmm, you didn't for bzip2
12:23:36  <Ammler> möh
12:23:42  <Ammler> I don't either then
12:24:28  <planetmaker> hm?
12:24:44  <planetmaker> it could be changed...
12:27:31  <Ammler> :-( and gzip doesn't have -k
12:28:49  <Ammler> then it makes indeed sense to hardcode this and use cat for gzip
13:01:42  <Ammler> planetmaker: you have 11.0 or 11.1 at work?
13:02:03  <Ammler> because there is LTS for 11.1
13:02:45  <Ammler> also not much risk to dup from 11.0 to 11.1, imo :-)
13:14:26  <planetmaker> I think 11.0. But it might be worth considering. Thanks for that hint
13:18:07  <Ammler> 11.1 has for sure xz and maybe you could use xz from 11.1 on 11.0 too
13:18:30  <Ammler> also why are tools and flags splitted in the makefile.def?
13:18:47  <Ammler> it is possible to use another tool but keep the flags?
13:19:18  <planetmaker> it's possible to keep the tool and use other flags
13:19:34  <planetmaker> or maybe your binary is named differently or you want to use another version of it
13:21:14  <Ammler> I see, it makes sense not splitting the flags, as another tool might have other flags
13:21:31  <Ammler> e.q. we use 7za on the devzone
13:21:37  <planetmaker> ^^ yep
13:24:19  *** DayDreamer has quit IRC
13:25:11  *** DayDreamer has joined #openttdcoop.devzone
13:29:11  <Ammler> $@ is target, $^ is first dependency, what is $< ?
13:29:37  <Ammler> no, $< is first
13:29:44  <Ammler> so what is $^?
13:29:58  <planetmaker> all dependencies
13:29:59  <Ammler> hmm
13:30:11  <Ammler> $^ is all?
13:30:19  <Ammler> or $<?
13:30:22  <planetmaker> one way or the other $^ or $<, I don't know right now
13:30:26  <Ammler> ok
13:30:28  <planetmaker> one is first, the other all
13:32:05  <planetmaker> $^ is all
13:32:10  <planetmaker> then $< is first
13:34:16  <planetmaker> 10.5.3 in
13:34:17  <Webster> Title: GNU `make' (at
13:36:27  <Ammler> also IMO the config would be more verbose, if you would use long option names, as you don't need to type those
13:38:35  <planetmaker> can you explain what you mean?
13:38:55  <planetmaker> or rather where
13:49:14  *** DayDreamer1 has joined #openttdcoop.devzone
13:52:14  *** DayDreamer has quit IRC
14:09:13  <Brot6> DictatorAI - Revision 109:da0d05ee16b9: - Correct bug div by zero after airport upgrade and airpo... (krinn) @
14:09:13  <Brot6> DictatorAI - Revision 110:303e1bf2ac1d: - Pffff, correct a bug with road health checker that prev... (krinn) @
14:09:13  <Brot6> DictatorAI - Revision 111:92e2a7d433c6: - version set to 098, after some more tests, should be re... (krinn) @
14:51:36  <Ammler> planetmaker: I think, you used % too less :-P
14:52:02  <Ammler> like you can use %.tar: % for binary bundle and for source bundle
14:52:25  <Ammler> or then all the %.tar.xz: %.tar
14:55:58  <planetmaker> for bundles: maybe
14:56:17  <planetmaker> it's one of the oldest parts which never got rewritten really
15:06:44  <Ammler> I "alias" bundle_src to bundle_gsrc, which makes tar.gz as now
15:06:58  <Ammler> and add a note, that it is depreciated
15:07:10  <Ammler> uploading the diff
15:09:11  <Ammler> hmm, I commit it to opengfx, you can pull from there if you like it
15:09:26  <Ammler> or else revert my change
15:10:24  <Ammler> or hmm
15:12:25  <Brot6> OpenGFX - Revision 630:1c60ba72c0ab: Cleanup/Feature: add target to create source bundle compress... (Ammler) @
15:14:49  <Ammler> oh
15:16:28  <planetmaker> uhm... I'm not sure that %.tar: % works in all cases. Are you sure? Did you also test releases?
15:18:59  <Ammler> % <-- does at least not work
15:19:24  <Ammler> %.tar: % is from you
15:19:37  <Ammler> oh, it isn't
15:19:38  <planetmaker> no
15:24:00  <Ammler> another reason, the build script should not be part of the grf repo
15:24:19  <Ammler> how will you run that on past rev?
15:24:34  <planetmaker> hm?
15:24:46  <Ammler> how shall I test release :-P
15:24:57  <Ammler> or how will you use it for release 0.3.3
15:24:59  <planetmaker> not on the devzone
15:25:17  <Ammler> yeah, locally I can create a dummy tag
15:25:24  <planetmaker> but you can locally a) copy your repo. Tag the version. up the version. bundle the version and see
15:25:29  <Ammler> but then I have still no .xz bundle fro 0.3.3
15:25:36  <planetmaker> I do that prior to every opengfx release
15:25:45  <planetmaker> Ammler, that we don't want.
15:25:57  <planetmaker> We don't update the past
15:25:58  <Ammler> s/we/I/ :-P
15:26:10  <planetmaker> Neither was that asked for
15:26:19  <planetmaker> It was asked for the next one. And that's fair enough
15:26:20  <Ammler> yeah, it is fine, anyway
15:26:26  <planetmaker> Everything else is... "Frickeln"
15:26:47  <planetmaker> and could be done by hand. But not by means of any repo-operation
15:26:47  <Ammler> would be nice to have the Makefile as a seperate build tool
15:26:51  <planetmaker> no
15:27:09  <Ammler> well, what is in scripts at least
15:27:20  <planetmaker> A makefile always targets the project. And it allows customization
15:27:24  <Ammler> the Makefile and Makefile.conf are still needed
15:27:29  <planetmaker> You actually can hardly build the project without
15:27:41  <planetmaker> and and...
15:27:50  <planetmaker> whatever custom script you have.
15:27:50  <Ammler> yes, I also can hardly build opengfx without grfcodec
15:28:01  <Ammler> and it isn't part of the source
15:31:28  *** Lakie has joined #openttdcoop.devzone
15:31:56  <planetmaker> Ammler, but unlike a binary you cannot out-source a Makefile to another directory
15:32:12  <planetmaker> it's always working relative to where it resides
15:34:39  <Ammler> hmm, bundle_zip works for releases but seems not working for nightlies
15:35:41  <Ammler> mäh, I am not able to handle kdiff3
15:35:57  <Ammler> how do I tell, which of the 3 versions to use?
15:36:21  <planetmaker> .hg/hgrc
15:36:55  <Ammler> oh, found
15:37:02  <Ammler> ctrl 1/2/3
15:37:11  <Ammler> or with right mouse :-)
15:37:23  <Ammler> very nice
15:37:50  <Ammler> how to the poor non kde do such merges?
15:39:34  <Ammler> planetmaker: any idea, why the zip only has versioned filename?
15:39:44  <planetmaker> intended
15:41:25  <Ammler> but then, we should do that for all bundles?
15:41:44  <Ammler> maybe that was for zip only, because that is the only bundle we release
15:42:07  <Ammler> publish
15:42:23  <planetmaker> yes, iirc
15:43:08  <Ammler> hmm, it is complicated for the others, we use the tar there
15:43:14  <Ammler> and that needs to be unverioned
15:43:25  <planetmaker> yes. And that's why it is as it was ;-)
15:43:36  <Ammler> then we keep that
15:43:47  <Ammler> not really important, it works for releases
15:44:01  <Ammler> this is just a topic for nightlies
15:46:28  <planetmaker> eh? keep what?
15:47:37  <Ammler> this ^ :-)
15:47:57  <Ammler> or this v
15:48:12  <Brot6> OpenGFX - Revision 631:e1bdea7ea0a6: Fix (rPREV): missing filename for gzip, zip has verioned nam... (Ammler) @
15:49:29  <Brot6> Example NewGRF Project - Feature Request #2499: new bundle compression xz (Ammler) @
15:51:08  <Ammler> so we just switch to .xz and wait until someone misses .gz and then build both?
15:53:58  <planetmaker> nah. We just build both
15:54:09  <planetmaker> bundle_src --> build .xz and .gz
15:54:41  <Brot6> OpenGFX - Revision 632:ad46a2bcd3c5: Change: compress source bundle with xz, instead gzip (Ammler) @
15:56:43  <Ammler> really, I am not friend of providing multiple formats of the same
15:57:21  <Ammler> I thought, if that is required, can do it, as they build it too anyway
15:57:39  <Ammler> and I assume, most download it there
15:59:40  <Brot6> OpenGFX - Revision 633:8756f0fc069d: Fix rPREV: but keep gzip (Ammler) @
16:03:25  <Ammler> (we should not change bundle_src, imo)
16:07:50  <Ammler> marcel@inspiron:~/hg/opengfx> make bundle_xsrc
16:07:51  <Ammler> [TAR] opengfx-nightly-r633-source.tar
16:07:53  <Ammler> [XZ] opengfx-nightly-r633-source.tar.xz
16:07:54  <Ammler> rm opengfx-nightly-r633-source.tar
16:08:06  <Ammler> something deletes the tar at the end, what could that be?
16:11:02  <Brot6> AroAI - Bug #2500 (New): aroai fails to compile (OTTDmaster) @
16:20:59  <planetmaker> hm...
16:23:20  <V453000> nice nickname
16:23:52  <planetmaker> you know him...
16:23:55  <V453000> yes
16:24:07  <V453000> I was just surprised to see him here :)
16:27:12  *** frosch123 has joined #openttdcoop.devzone
17:01:48  *** DanMacK has quit IRC
17:18:52  <Brot6> CHIPS Station Set - Bug #2501 (New): DevZone compile failed (compiler) @
17:19:45  <Brot6> OpenGFX - Bug #2502 (New): DevZone compile failed (compiler) @
17:21:14  <Ammler> hmm
17:25:06  <planetmaker> why did it fail?
17:26:31  <Brot6> OpenGFX - Revision 634:b18b98be01e0: Fix (r632): xz needs to be moved to the final BUILD dir (Ammler) @
17:26:36  <Ammler> planetmaker: check r634 :-)
17:26:46  <planetmaker> :-)
17:27:07  <Ammler> and it will confirm in 2 mins
17:27:18  <planetmaker> oi :-)
17:27:24  <Ammler> u
17:27:39  <planetmaker> I recently saw very tasty arctic wagons by DanMacK :-)
17:27:47  <planetmaker> we can expect some advances there :-)
17:28:34  <Ammler> my only contribution was the house fix and finding the bug about your nml, I was quite bad, sorry :-P
17:28:47  <planetmaker> don't feel bad
17:28:54  <planetmaker> add the planes :-P
17:29:16  <Ammler> yes, which was the part about "finding the bug in your nml"
17:29:19  <planetmaker> I didn't feel like doing much either
17:29:36  <Ammler> since nobody uses nightly anymore :-P
17:30:03  <Ammler> oh, indeed opengfx needs more time
17:30:37  <planetmaker> well. No one using them doesn't mean it should stop development ;-)
17:31:05  <Ammler> I meant nobody does report obvious bugs anymore
17:31:27  <Ammler> if devs need to find those self, it goes worse ;-)
17:31:27  <planetmaker> oh, I think there were again in 0.3.3 some bug fixes. Actually quite some
17:32:12  <Ammler> hmm, were I too fast with fixing the ogfx bug?
17:32:18  <planetmaker> monorail tracks, hangar, maglev crossings
17:32:35  <planetmaker> that's ok, I think :-)
17:32:56  <planetmaker> When the planes are in and / or the trains we'll need to release a new one ;-)
17:33:07  <Ammler> but those bugs were found in the ogfx release, weren't?
17:33:11  <Ammler> not in the nightly
17:33:20  <planetmaker> possibly yes
17:33:26  <Ammler> so they don't count
17:33:46  <planetmaker> well, still they were reported which is good
17:33:59  <Ammler> maybe we should start to upload ogfx nightly to bananas
17:34:07  <Ammler> available for openttd 1.2
17:34:08  <planetmaker> the problem with opengfx nightly is, we can't really offer new features
17:34:20  <planetmaker> nah, just release more often ;-)
17:34:57  <Ammler> yeah, at least keep the release cycle from now, also if there aren't many changes
17:35:00  <planetmaker> September is 0.4 ;-) We still have 6 releases before we have to think whether it's 3.3.A or 3.3.10 ;-)
17:35:12  <Ammler> A is bad
17:35:20  <Ammler> A < 1
17:35:25  <planetmaker> ah
17:35:34  <planetmaker> but 10 < 9
17:35:38  <planetmaker> or not?
17:35:42  <Ammler> no
17:35:47  <planetmaker> ah
17:35:48  <planetmaker> ok :-)
17:36:26  <Ammler> no idea, why alpha is lower as numberic, maybe because of "beta"
17:37:34  <Ammler> next time I also need to rember that beta > RC :-)
17:37:38  <Ammler> but BETA < RC
17:38:15  <planetmaker> tsk
17:38:27  <Ammler> well, openttd should also do that
17:38:37  <Ammler> either use beta and rc or BETA and RC
17:39:03  <planetmaker> but... beta and RC look nicer ;-)
17:39:14  <Ammler> nice but wrong
17:40:08  <Ammler> I didn't think about it, but it does not really matter, as I don't publish the testing on games
17:41:13  <planetmaker> see you later. Off for sports
17:41:20  <Ammler> oh btw. you were gone last time I spoke with Yexo about the opengfx dir bug, shall I report that or just ignore?
17:42:07  <Ammler> I "fixed" it with versioning the directory, which you removed by request from blathijs and me, iirc
17:51:35  <Ammler> mäh
17:51:40  <Ammler> I might have broken redmine
17:52:04  <Ammler> if so, I might not fix it today :-)
18:29:04  <Brot6> Nutracks - Feature #2498: Medium speed track GFX (oberhuemer) @
18:30:18  <Brot6> 2cc train set - Feature #56: rework region availability parameter (DJNekkid) @
18:37:44  *** andythenorth has joined #openttdcoop.devzone
18:38:33  <andythenorth> hello
18:47:38  <Brot6> Nutracks - Feature #2498: Medium speed track GFX (oberhuemer) @
19:20:49  *** andythenorth has quit IRC
19:27:56  *** KenjiE20 has quit IRC
19:28:17  *** KenjiE20 has joined #openttdcoop.devzone
20:07:34  *** Brot6 has quit IRC
20:10:06  *** Brot6 has joined #openttdcoop.devzone
20:10:45  <Brot6> Hallo :-)
20:11:07  <Brot6> Yeah, I am back :-P
20:26:48  <frosch123> how was your flour soup?
20:28:44  <Ammler> Mehlsuppe? Kennst du das?
20:29:09  <Ammler> or does that mean something else? :-)
20:53:58  <planetmaker> moin
21:34:00  <frosch123> i thought flour soup is brot's favorite meal
21:44:20  *** andythenorth has joined #openttdcoop.devzone
21:46:16  *** ODM has quit IRC
21:48:20  <Brot6> Nutracks - Feature #2498: Medium speed track GFX (oberhuemer) @
21:50:08  <Brot6> Nutracks - Feature #2498: Medium speed track GFX (oberhuemer) @
21:50:33  <Brot6> chips: update from r108 to r114 done (2 errors) -
21:51:10  <Yexo> why is brot announcing the new compile even before the commit?
21:51:43  <andythenorth> time travel
21:52:06  <planetmaker> and you were certainly told to NOT mess with time! Damn you ;-)
21:52:30  <planetmaker> and now we have the temporal loop with all this consequence...
21:52:41  <planetmaker> Yexo: it's different streams for Brot
21:53:31  <Ammler> Yexo: chips was broken, so the commit now triggered a rebuild
21:53:50  <Ammler> and brot was broken until [22:11] <Brot6> Yeah, I am back  :-)
21:55:12  <Ammler> hmm, was there a commit?
21:55:31  *** frosch123 has quit IRC
21:56:10  <Yexo> Ammler: chips r114 was at 22:49 which caused the chips rebuilt
21:56:21  <Yexo> but only the built was shown, not the commit. that was what I was referring too
21:57:53  <Ammler> oh, did I mention [19:51] <Ammler> I might have broken redmine :-P
21:58:39  <Ammler> because rbot was broken, I run a ruby update which might have broken redmine
21:58:46  <Ammler> ran*
21:59:15  <Ammler> I will check now
22:02:09  <Ammler> consider devzone down for some time, sorry :-(
22:02:21  <Ammler> @services op
22:02:21  *** ChanServ sets mode: +o Webster
22:02:29  <Ammler> @topic DevZone down for maintenance
22:02:29  <Webster> Ammler: (topic [<channel>]) -- Returns the topic for <channel>. <channel> is only necessary if the message isn't sent in the channel itself.
22:02:33  <Ammler> @topic add DevZone down for maintenance
22:02:33  *** Webster changes topic to "Talk about things hosted and developed on | Downloads log: | Sandbox passwords are the same as the usernames | DevZone down for maintenance"
22:03:33  <planetmaker> err...
22:04:23  *** andythenorth has left #openttdcoop.devzone
22:05:32  <Ammler> :-)
22:07:01  <Brot6> Unable to connect to Failed.  Response code = 500.  Response message = Internal Server Error.
22:14:02  <Brot6> Unable to connect to Failed.  Response code = 500.  Response message = Internal Server Error.
22:21:01  <Brot6> Unable to connect to Failed.  Response code = 500.  Response message = Internal Server Error.
22:23:34  <Ammler> (still sorry :-P )
22:27:50  <Ammler> testing back:
22:27:59  <Ammler> now, deploying...
22:28:01  <Brot6> Unable to connect to Failed.  Response code = 500.  Response message = Internal Server Error.
22:28:06  <Ammler> hmm, the navbar is missing
22:28:20  <Ammler> I do deploy what I have, fix the rest and deploy again
22:31:59  <Ammler> oh, btw. the patch queue is a lot smaller (from around 30 patches to around < 10) :-)
22:32:50  <Ammler> <-- isn't that cool :-P
22:34:21  <Ammler> <-- Yexo
22:34:38  <Brot6> FIRS Industry Replacement Set - Revision 1913:c749fbcf7836: Update: Serbian translation (etran) (planetmaker) @
22:34:38  <Brot6> CHIPS Station Set - Revision 114:68913190d335: Add: missing file for parcels_office.pnfo (andythenorth) @
22:34:38  <Brot6> CHIPS Station Set - Revision 115:bb130a15b99a: Change: improve appearance of Parcels Office (andythenorth) @
22:34:48  <Ammler> oh, there they are :-D
22:35:49  <Ammler> since the mercurial patches are all in trunk, please tell me, if you miss something
22:36:03  <Ammler> I disabled all those patches, didn't even try to apply
22:36:08  <planetmaker> will do :-)
22:36:28  <Ammler> and again SORRY
22:36:56  <Ammler> I din't want to make a zypper up
22:37:02  <Ammler> just a single package
22:37:13  <planetmaker> https doesn't work
22:37:34  <planetmaker> I can't push opengfx anymore
22:37:45  <planetmaker> and it worked this morning ;-)
22:38:13  <planetmaker> authorization failed it tells me
22:38:15  <planetmaker> I wonder why
22:38:51  <Ammler> maybe I need to restart the hgredmine proxy too
22:47:55  <planetmaker> Ammler: can't the 'donate' button be placed in the headline below the search fields?
22:48:55  *** welshdragon has joined #openttdcoop.devzone
22:55:04  <Ammler> mist
22:55:19  <Ammler> I have no clue, why hgredmine doesn't work
22:55:53  <Ammler> I wouldn't have found that issue also if I would made the update like other time
23:07:06  <Ammler> they added salt to the users/password db
23:09:28  <Ammler> hashed_password = hashlib.sha1(password).hexdigest()
23:09:56  <Ammler> Yexo: around?
23:10:00  <Ammler> it is python
23:10:19  <Ammler> how do I hash the password with salt?
23:10:42  <Yexo> yes, I'm around
23:11:05  <Yexo> I don't see a salt in that line
23:11:23  <Yexo> <Ammler> how do I hash the password with salt? <- that question is way too vague to answer
23:11:34  <Yexo> is there are different salt per user (as there should be)?
23:11:42  <Yexo> if so, how is that salt determined?
23:14:04  <Ammler> well, I can query the salt first
23:14:10  <Ammler> it is in the db per user
23:15:22  <Ammler>
23:17:18  *** Lakie has quit IRC
23:17:51  <Yexo> try something like: AND users.hashed_password=SHA1(users.salt + \'%(ph)s\'
23:18:05  <Yexo> and replace hashed_password on line 89 by password
23:18:39  <Yexo> this might lead to an sql injection vulnerability, as I don't know if password is safe to use that way in a query
23:18:50  <Yexo> if it isn't, get the salt first from the db
23:21:23  <Ammler> Yexo: so i should make the hash with mysql instead python
23:21:39  <Yexo> I just found out from the documentation that it won't work
23:21:47  <Yexo> you'll need to make the hash with python
23:23:02  <Yexo> so remove the AND users.hashed_password= part altogether from the query and add users.hashed_password to the list of columns you select
23:23:17  <Yexo> oh, and the salt too of course
23:23:32  <Yexo> after that not only check if you found a row (which means the users exists) but also if the password is correct
23:24:24  <Ammler> yes, then we go back to my question, how to hash pw with salt with python?
23:25:28  <Yexo> that depends on how the salt is used
23:25:52  <Yexo> it's something like hashlib.sha1(salt + password).hexdigest()
23:26:02  <Yexo> but salt and password could also be the other way around
23:26:23  <Yexo> why not check how redmine does it?
23:29:24  <Ammler>
23:29:25  <Webster> Title: Redmine - /trunk/app/models/user.rb - Diff - Redmine (at
23:29:58  <Ammler> self.hashed_password = User.hash_password("#{salt}#{User.hash_password clear_password}")
23:30:12  <Ammler> ruby ^
23:31:01  <Yexo> hashlib.sha1(salt + hashlib.sha1(password).hexdigest()).hexdigest() <- my guess
23:31:37  <Ammler> It changes password storage scheme from SHA1(password) to SHA1(salt + SHA1(password))
23:31:57  <Ammler> looks like your guess
23:32:09  <Yexo> that seems wrong, taking the hash of a hash
23:32:16  <Yexo> they do it though
23:32:36  <Yexo> I mean theoretically it seems wrong, although that's more a gut feeling than that I can prove it wrong
23:32:54  <Ammler> I thought, it isn't needed for sha1 anyway
23:33:42  <Ammler> also shouldn't the salt be on another place as the hash?
23:34:43  <Yexo> why?
23:34:43  <Ammler> I mean, I have salt and hash so I can still theoretically calc the plain password, can't I?
23:35:17  <Yexo> no, you can't recalculate the original value if you have the hash
23:35:34  <Ammler> well, not calc
23:35:50  <Ammler> but with brute force try...
23:36:13  <Ammler> the salt is useless that way, imo
23:36:15  <Yexo> sure you can, but even than you won't be sure if you got the original password or just another value that has the same hash
23:36:31  <Ammler> and what is the salt for?
23:36:45  <Yexo> without hash you could bruteforce all passwords at the same time
23:36:59  <Yexo> with a different hash per user you can only bruteforce one password at a time
23:37:16  <Ammler> but I have hash and salt
23:37:34  <Yexo> so say your has is BCD
23:37:56  <Yexo> to bruteforce you try BCDA, BCDB, BCDC, .. BCDAA, BCDAB, BCDAC.... etc.
23:38:24  <Yexo> now if you have a different hash per user you have to try all those again with the new hash for each user
23:46:12  *** KenjiE20 has quit IRC
23:48:02  <Ammler> ok, push works again
23:48:04  <Ammler> but :-(
23:48:22  <Ammler> the uwsgi doesn't
23:48:29  <Ammler> which is strange
23:50:42  <Ammler> <--row94
23:51:06  <Ammler> looks good, doesn't?
23:51:38  <Ammler> I guess, I try reboot
23:52:00  <Ammler> no idea, how uwsgi caches something or what that could be
23:55:25  <Yexo> sorry, I didn't really get what doesn't work now
23:55:30  <Yexo> and it's getting late, time to sleep
23:55:34  <Yexo> good night
23:56:22  <Ammler> Yexo: all fine, thank you very much :-)
23:56:42  <Ammler> the part you teached me at least works

Powered by YARRSTE version: svn-trunk