Ferry Huberts [Wed, 6 Nov 2013 13:16:20 +0000 (14:16 +0100)]
Merge branch 'release-0.6.6'
* release-0.6.6:
pud: fix java detection in the wireformat java bindings (again)
Ferry Huberts [Wed, 6 Nov 2013 13:16:14 +0000 (14:16 +0100)]
Merge branch 'release-0.6.5'
* release-0.6.5:
pud: fix java detection in the wireformat java bindings (again)
Ferry Huberts [Wed, 6 Nov 2013 13:14:53 +0000 (14:14 +0100)]
pud: fix java detection in the wireformat java bindings (again)
Debian turns out to be a huge pain. Now I need to also check '-amd64'
since Wheezy changed it again... sigh...
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 6 Nov 2013 13:14:53 +0000 (14:14 +0100)]
pud: fix java detection in the wireformat java bindings (again)
Debian turns out to be a huge pain. Now I need to also check '-amd64'
since Wheezy changed it again... sigh...
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 6 Nov 2013 13:14:53 +0000 (14:14 +0100)]
pud: fix java detection in the wireformat java bindings (again)
Debian turns out to be a huge pain. Now I need to also check '-amd64'
since Wheezy changed it again... sigh...
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 21 Oct 2013 16:12:25 +0000 (18:12 +0200)]
Merge branch 'release-0.6.6'
* release-0.6.6:
Update version after release of v0.6.6.1
Release v0.6.6.1
Fix jsoninfo again after a regression which was introduced with http://olsr.org/git/?p=olsrd.git;a=commit;h=
8f633c9f54e179ce530291571a13b3b96d288bf4 For a discussion of the bug see http://olsr.org/bugs/view.php?id=40 Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,
Conflicts:
Makefile
gui/win32/Inst/installer.nsi
gui/win32/Main/Frontend.rc
Henning Rogge [Mon, 21 Oct 2013 15:56:55 +0000 (17:56 +0200)]
Update version after release of v0.6.6.1
Signed-off-by: Henning Rogge <hrogge@googlemail.com>
Henning Rogge [Mon, 21 Oct 2013 15:56:50 +0000 (17:56 +0200)]
Release v0.6.6.1
Signed-off-by: Henning Rogge <hrogge@googlemail.com>
Ferry Huberts [Tue, 8 Oct 2013 12:35:33 +0000 (14:35 +0200)]
httpinfo: also show the present field on the nmea info
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 8 Oct 2013 12:04:20 +0000 (14:04 +0200)]
pud: make sure to only use accessor functions in the 'present' nmea field
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 8 Oct 2013 12:03:17 +0000 (14:03 +0200)]
httpinfo: rename a function
To more closely match the nmea function name.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 4 Oct 2013 08:18:11 +0000 (10:18 +0200)]
pud: add UUID nodeId type
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 4 Oct 2013 08:36:41 +0000 (10:36 +0200)]
pud: fix intSetupNodeIdBinaryDoubleLongLong for short values
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 4 Oct 2013 08:02:51 +0000 (10:02 +0200)]
pud: specify where to store the result in intSetupNodeIdBinaryDoubleLongLong
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 4 Oct 2013 07:58:27 +0000 (09:58 +0200)]
pud: don't copy memory we're not allowed to access
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 4 Oct 2013 07:37:41 +0000 (09:37 +0200)]
pud: specify conversion base in readULL
Also in intSetupNodeIdBinaryDoubleLongLong
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Oct 2013 13:10:45 +0000 (15:10 +0200)]
pud: add an assert to silence a Coverity false positive
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Oct 2013 10:11:48 +0000 (12:11 +0200)]
pud: add MIP OID nodeId type
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Oct 2013 08:51:56 +0000 (10:51 +0200)]
pud: clarify the URN number
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Oct 2013 10:01:08 +0000 (12:01 +0200)]
pud: make wireformat constants unsigned
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Oct 2013 13:35:19 +0000 (15:35 +0200)]
pud: remove a strlen in the DNS name handling of the wire format.
This makes the handling of DNS names in the wire format much more robust.
This commit prepares for not having a terminating '\0' for a DNS name in
the wire format. However, since that is a breaking change, we don't
actually make that change until a later point in time at which we're
forced to break compatibility anyway.
The benefit of saving a single byte in this case is too minor to justify
breaking the compatibility.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Oct 2013 12:40:25 +0000 (14:40 +0200)]
pud: remove some strlen's in nettools
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Oct 2013 12:46:32 +0000 (14:46 +0200)]
pud: merge nodeIdType and nodeId parameters into nodeId parameter
So that we can do an early validity check.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Oct 2013 10:26:04 +0000 (12:26 +0200)]
pud: firm up setupNodeIdBinaryAndValidate
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Oct 2013 09:37:50 +0000 (11:37 +0200)]
pud: remove getNodeId, rename getNodeIdWithLength to getNodeId
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Teco Boot [Tue, 17 Sep 2013 06:51:29 +0000 (08:51 +0200)]
Added LINUX_NL80211 readme file
Hans-Christoph Steiner [Sat, 14 Sep 2013 00:47:38 +0000 (20:47 -0400)]
clarify instructions for downloading of debian/ folder
Hans-Christoph Steiner [Tue, 10 Sep 2013 20:05:13 +0000 (16:05 -0400)]
add instructions for building Debian package from canonical sources
Hans-Christoph Steiner [Tue, 10 Sep 2013 19:52:47 +0000 (15:52 -0400)]
purge ancient debian/ folder, people should use the current files
Manuel Munz [Fri, 23 Aug 2013 19:02:23 +0000 (21:02 +0200)]
Fix jsoninfo again after a regression which was introduced with
http://olsr.org/git/?p=olsrd.git;a=commit;h=
8f633c9f54e179ce530291571a13b3b96d288bf4
For a discussion of the bug see http://olsr.org/bugs/view.php?id=40
Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,
Manuel Munz [Fri, 23 Aug 2013 19:02:23 +0000 (21:02 +0200)]
Fix jsoninfo again after a regression which was introduced with
http://olsr.org/git/?p=olsrd.git;a=commit;h=
8f633c9f54e179ce530291571a13b3b96d288bf4
For a discussion of the bug see http://olsr.org/bugs/view.php?id=40
Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,
Ferry Huberts [Mon, 19 Aug 2013 20:56:29 +0000 (22:56 +0200)]
Fix #34: Description of "timeout" parameter in "nameservice" plugin...
...is misleading
http://olsr.org/bugs/view.php?id=34
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Sat, 17 Aug 2013 09:15:34 +0000 (11:15 +0200)]
Merge branch 'release-0.6.6'
* release-0.6.6:
Update version after release of v0.6.6
Release v0.6.6
Fix build break for MinGW compilation on Fedora 19. Still throws a lot of warnings
jsoninfo: ensure output is wrapped in curly braces.
pud: fix readIPAddress function
Makefile: fix builddata when building from tarball
build: only print the md5 hash in hash_source.sh
build: really _ignore_ builddata.c when hashing sources
pud: nmealib: _nmea_parse_time not parsing hsec when given "hhmmss" format
txtinfo: update README file
Conflicts:
CHANGELOG
Makefile
gui/win32/Inst/installer.nsi
gui/win32/Main/Frontend.rc
lib/txtinfo/README_TXTINFO
make/hash_source.sh
Ferry Huberts [Sat, 17 Aug 2013 09:06:37 +0000 (11:06 +0200)]
Merge branch 'release-0.6.5'
* release-0.6.5:
Update version after release of v0.6.5.5
Release v0.6.5.5
Fix build break for MinGW compilation on Fedora 19. Still throws a lot of warnings
jsoninfo: ensure output is wrapped in curly braces.
pud: fix readIPAddress function
Makefile: fix builddata when building from tarball
build: only print the md5 hash in hash_source.sh
build: really _ignore_ builddata.c when hashing sources
Update version after release of v0.6.5.4
Release v0.6.5.4
pud: nmealib: _nmea_parse_time not parsing hsec when given "hhmmss" format
txtinfo: prevent buffer overflow
Conflicts:
Makefile
gui/win32/Inst/installer.nsi
gui/win32/Main/Frontend.rc
make/hash_source.sh
Henning Rogge [Sat, 17 Aug 2013 09:03:40 +0000 (11:03 +0200)]
Update version after release of v0.6.6
Signed-off-by: Henning Rogge <hrogge@googlemail.com>
Henning Rogge [Sat, 17 Aug 2013 09:03:40 +0000 (11:03 +0200)]
Release v0.6.6
Signed-off-by: Henning Rogge <hrogge@googlemail.com>
Henning Rogge [Sat, 17 Aug 2013 08:55:51 +0000 (10:55 +0200)]
Update version after release of v0.6.5.5
Signed-off-by: Henning Rogge <hrogge@googlemail.com>
Henning Rogge [Sat, 17 Aug 2013 08:55:44 +0000 (10:55 +0200)]
Release v0.6.5.5
Signed-off-by: Henning Rogge <hrogge@googlemail.com>
Henning Rogge [Sat, 17 Aug 2013 08:28:17 +0000 (10:28 +0200)]
Fix build break for MinGW compilation on Fedora 19.
Still throws a lot of warnings
Henning Rogge [Sat, 17 Aug 2013 08:28:17 +0000 (10:28 +0200)]
Fix build break for MinGW compilation on Fedora 19.
Still throws a lot of warnings
Henning Rogge [Sat, 17 Aug 2013 08:28:17 +0000 (10:28 +0200)]
Fix build break for MinGW compilation on Fedora 19.
Still throws a lot of warnings
Ferry Huberts [Fri, 16 Aug 2013 08:35:33 +0000 (10:35 +0200)]
httpinfo: center the header row of the smart gateway tables
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Scott Kidder [Thu, 15 Aug 2013 17:06:23 +0000 (10:06 -0700)]
jsoninfo: ensure output is wrapped in curly braces.
Ferry Huberts [Thu, 15 Aug 2013 21:11:04 +0000 (23:11 +0200)]
pud: fix readIPAddress function
It would also set the port instead of only the IP address, thereby
opening up the possibility to lose the port if the address is set
after the port.
Reported-by: shkdee
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Scott Kidder [Thu, 15 Aug 2013 17:06:23 +0000 (10:06 -0700)]
jsoninfo: ensure output is wrapped in curly braces.
Ferry Huberts [Thu, 15 Aug 2013 21:11:04 +0000 (23:11 +0200)]
pud: fix readIPAddress function
It would also set the port instead of only the IP address, thereby
opening up the possibility to lose the port if the address is set
after the port.
Reported-by: shkdee
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Scott Kidder [Thu, 15 Aug 2013 17:06:23 +0000 (10:06 -0700)]
jsoninfo: ensure output is wrapped in curly braces.
Ferry Huberts [Thu, 15 Aug 2013 21:11:04 +0000 (23:11 +0200)]
pud: fix readIPAddress function
It would also set the port instead of only the IP address, thereby
opening up the possibility to lose the port if the address is set
after the port.
Reported-by: shkdee
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 15 Aug 2013 19:59:22 +0000 (21:59 +0200)]
build: hash_source.sh: specify the mktemp template
Mac OSX is a bit backward in this regard
Reported-by: Scott Kidder <kidder.scott@gmail.com>
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 31 Jul 2013 13:01:31 +0000 (15:01 +0200)]
sgwdynspeed: install configuration files under ETCDIR
Now that we changed ETCDIR to /etc/olsrd/
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 31 Jul 2013 13:01:17 +0000 (15:01 +0200)]
pud: install configuration files under ETCDIR
Now that we changed ETCDIR to /etc/olsrd/
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 31 Jul 2013 12:56:51 +0000 (14:56 +0200)]
Move the configuration files into /etc/olsrd/
The openwrt files were NOT touched.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 24 Jul 2013 12:01:50 +0000 (14:01 +0200)]
make: fixup bashisms in hash_source.sh
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 12 Jul 2013 11:07:23 +0000 (13:07 +0200)]
sgw: minor comment fixup
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 12 Jul 2013 08:27:12 +0000 (10:27 +0200)]
sgw: move cost calculation into it own unit
I'm going to reuse the code in another project
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 11 Jul 2013 13:22:12 +0000 (15:22 +0200)]
cfgfile: no more magic numbers for RtTable* defaults
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 11 Jul 2013 10:11:17 +0000 (12:11 +0200)]
build: only re-generate src/builddata.c when needed
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 10 Jul 2013 15:50:38 +0000 (17:50 +0200)]
Makefile: fix builddata when building from tarball
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 10 Jul 2013 16:00:52 +0000 (18:00 +0200)]
build: only print the md5 hash in hash_source.sh
Some md5sum programs print in the format
md5_hash -
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 10 Jul 2013 15:56:51 +0000 (17:56 +0200)]
build: really _ignore_ builddata.c when hashing sources
Somehow the -v got dropped
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 10 Jul 2013 15:50:38 +0000 (17:50 +0200)]
Makefile: fix builddata when building from tarball
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 10 Jul 2013 16:00:52 +0000 (18:00 +0200)]
build: only print the md5 hash in hash_source.sh
Some md5sum programs print in the format
md5_hash -
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 10 Jul 2013 15:56:51 +0000 (17:56 +0200)]
build: really _ignore_ builddata.c when hashing sources
Somehow the -v got dropped
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 10 Jul 2013 15:50:38 +0000 (17:50 +0200)]
Makefile: fix builddata when building from tarball
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 10 Jul 2013 16:00:52 +0000 (18:00 +0200)]
build: only print the md5 hash in hash_source.sh
Some md5sum programs print in the format
md5_hash -
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 10 Jul 2013 15:56:51 +0000 (17:56 +0200)]
build: really _ignore_ builddata.c when hashing sources
Somehow the -v got dropped
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 9 Jul 2013 14:40:12 +0000 (16:40 +0200)]
linux: fix 'add -rdynamic to linker options for debug builds'
I moved some code around before committing and lost the ifeq DEBUG test
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 9 Jul 2013 14:34:55 +0000 (16:34 +0200)]
linux: add -rdynamic to linker options for debug builds
This will make sure that all symbols are kept in the libraries and
executables, so that backtraces will have proper names
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 25 Jun 2013 09:31:10 +0000 (11:31 +0200)]
Makefile: add cfgparser_install and cfgparser_clean targets
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Henning Rogge [Tue, 25 Jun 2013 09:03:24 +0000 (11:03 +0200)]
Fix segfault in cfgparser standalone executable
Ferry Huberts [Tue, 18 Jun 2013 14:36:28 +0000 (16:36 +0200)]
txtinfo: mention the /sgw command in the README
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 12 Jun 2013 16:15:17 +0000 (18:15 +0200)]
cfgfile: don't hard-code defaults in texts
Also improve some formatting and refrain from using < and > since
the generated text can be shown on a webpage (in HTML these characters
are reserved).
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 11 Jun 2013 16:00:57 +0000 (18:00 +0200)]
txtinfo: add sgw command
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 11 Jun 2013 14:33:51 +0000 (16:33 +0200)]
httpinfo: add smart gateway information tab
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 11 Jun 2013 07:53:27 +0000 (09:53 +0200)]
quagga: add some parentheses
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Henning Rogge [Thu, 16 May 2013 16:37:09 +0000 (18:37 +0200)]
Update version after release of v0.6.5.4
Signed-off-by: Henning Rogge <hrogge@googlemail.com>
Henning Rogge [Thu, 16 May 2013 16:37:09 +0000 (18:37 +0200)]
Release v0.6.5.4
Signed-off-by: Henning Rogge <hrogge@googlemail.com>
Ferry Huberts [Mon, 13 May 2013 07:35:42 +0000 (09:35 +0200)]
pud: nmealib: _nmea_parse_time not parsing hsec when given "hhmmss" format
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 13 May 2013 07:35:42 +0000 (09:35 +0200)]
pud: nmealib: _nmea_parse_time not parsing hsec when given "hhmmss" format
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Mon, 13 May 2013 07:35:42 +0000 (09:35 +0200)]
pud: nmealib: _nmea_parse_time not parsing hsec when given "hhmmss" format
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Saverio Proto [Fri, 10 May 2013 15:38:36 +0000 (17:38 +0200)]
txtinfo: update README file
Saverio Proto [Fri, 10 May 2013 15:38:36 +0000 (17:38 +0200)]
txtinfo: update README file
Ferry Huberts [Tue, 7 May 2013 12:13:15 +0000 (14:13 +0200)]
pud: wireformat: java: also add a Git-Descriptor manifest header
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 7 May 2013 12:12:33 +0000 (14:12 +0200)]
pud: wireformat: java: rename Git-SHA1 manifest header to Git-SHA
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 3 May 2013 10:18:06 +0000 (12:18 +0200)]
pud: wireformat-java: Makefile: also clean up the generated headers
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 3 May 2013 09:20:41 +0000 (11:20 +0200)]
Merge branch 'release-0.6.6'
* release-0.6.6:
txtinfo: prevent buffer overflow
Ferry Huberts [Fri, 3 May 2013 09:19:40 +0000 (11:19 +0200)]
txtinfo: prevent buffer overflow
Reported-by: Saverio Proto <zioproto@gmail.com>
Tested-by: Saverio Proto <zioproto@gmail.com>
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Fri, 3 May 2013 09:19:40 +0000 (11:19 +0200)]
txtinfo: prevent buffer overflow
Reported-by: Saverio Proto <zioproto@gmail.com>
Tested-by: Saverio Proto <zioproto@gmail.com>
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 24 Apr 2013 09:06:28 +0000 (11:06 +0200)]
Merge branch 'release-0.6.6'
* release-0.6.6:
release: also check against the Makefile version when branching
release: checkVersionIncrementing: optionally allow equal versions
release: only report that master changed when it was actually changed
release: do not update the version on master when it's already higher
release: refactor the checkVersionIncrementing function
release: update some comments
release: fix the list of generated files
Ferry Huberts [Wed, 24 Apr 2013 09:06:25 +0000 (11:06 +0200)]
Merge branch 'release-0.6.5'
* release-0.6.5:
release: also check against the Makefile version when branching
release: checkVersionIncrementing: optionally allow equal versions
release: only report that master changed when it was actually changed
release: do not update the version on master when it's already higher
release: refactor the checkVersionIncrementing function
release: update some comments
release: fix the list of generated files
Ferry Huberts [Wed, 24 Apr 2013 09:06:13 +0000 (11:06 +0200)]
Merge branch 'release-0.6.4'
* release-0.6.4:
release: also check against the Makefile version when branching
release: checkVersionIncrementing: optionally allow equal versions
release: only report that master changed when it was actually changed
release: do not update the version on master when it's already higher
release: refactor the checkVersionIncrementing function
release: update some comments
release: fix the list of generated files
build: ignore builddata.c when hashing sources
Remove mercurial ignore file; we use git
release: use olsrd-version prefix for files in the tarballs
Fix multicast join for IPv6
Ferry Huberts [Wed, 24 Apr 2013 09:03:40 +0000 (11:03 +0200)]
release: also check against the Makefile version when branching
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 24 Apr 2013 08:19:12 +0000 (10:19 +0200)]
release: checkVersionIncrementing: optionally allow equal versions
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 24 Apr 2013 09:03:40 +0000 (11:03 +0200)]
release: also check against the Makefile version when branching
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 24 Apr 2013 08:19:12 +0000 (10:19 +0200)]
release: checkVersionIncrementing: optionally allow equal versions
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 24 Apr 2013 09:03:40 +0000 (11:03 +0200)]
release: also check against the Makefile version when branching
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 24 Apr 2013 08:19:12 +0000 (10:19 +0200)]
release: checkVersionIncrementing: optionally allow equal versions
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 24 Apr 2013 07:37:09 +0000 (09:37 +0200)]
release: only report that master changed when it was actually changed
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 24 Apr 2013 07:36:10 +0000 (09:36 +0200)]
release: do not update the version on master when it's already higher
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 24 Apr 2013 07:15:51 +0000 (09:15 +0200)]
release: refactor the checkVersionIncrementing function
To return a success/fail value.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>