Fix installation and dependency generation of header files

Make unit test for imap modified utf7 optional

Make build of xml library part optional

Remove old autoconf file

Switch license from Intranator license to GPLv2 + linking exception (ACKed by Steffen)

Fix iconv include directory

Migrate libi2ncommon to cmake

Remove autoconf base stuff

Obsolete libgettext

Don't require libgettext in libi2ncommon's pkgconfig file

Merge libgettext code into libi2ncommon

Merge 'new-vacation-notice-UI'

Conflicts:
intranator-language/usr/intranator/lang/de/LC_MESSAGES/ui-data.mo
intranator-language/usr/intranator/lang/de/LC_MESSAGES/ui-data.po

Merge branch 'php-53-upgrade'

Merge branch 'cyrus-setacl-bug'

Conflicts:
packages/cyrus-imapd/cyrus-imapd-2.3.16-keep-owner-rights.patch

Own implementation of intuitive tristate logic

Increase version

Merge branch 'proxy-time-profiles'

Conflicts:
generate/test/Makefile.am

Merge branch 'dns-delegation'

Merge branch 'fsecure-update'

Merge remote branch 'origin/info_mqueue-long-long'

Removed ShortUnitFormat and UnitBase1024 from nice_unit_format() calls, as they are now the routine default parameters

Changed the default parameters value from nice_unit_format()

Switched the order of the nice_unit_format() parameters, because format changes more often than the base.

Removed the exabytes, zettabytes and yottabytes representations from nice_unit_format()
- Makes no sense keep those representations once int64 cannot handle them
- Added a safe guard to rollback values that cannot be represented (ie 2000.00 PB instead of 2.00 EB)
- Added a unit test to check how is represented the max int64 number

Added i18n_noop around long unit format symbol strings to be parsed by poedit

Renamed the constant to keep related with the arrays

Given another name to the arrays to make reference with the UnitFormat enumeration

Moved the rounding statement to its own function

Rename variables according with their enumeration type names

Renamed enumeration items to improve readability

Replaced all ocurrences of format_kb() by nice_unit_format()

Merge remote branch 'origin/wi2nlog'

Replaced format_kb() by nice_unit_format() in the test cases
- 3rd step to merge nice_unit_format() and format_kb()

Allow to select the length of the symbol, short or long
- short symbols are B, KB, MB, etc.
- long symbols are Bytes, KBytes, MBytes, etc.

Created test cases for format_kb()
- 2nd step to merge nice_unit_format() and format_kb()

Moved format_kb from arnielizer to libi2ncommon
- 1st step to merge nice_unit_format() and format_kb()

Added a prefix to the enumeration items to avoid possible conflicts

Changed nice_unit_format() to allow selection between SI and IEC Systems of Units
- SI allows multiples of decimal 1000 (nice_unit_format default behavior)
- IEC allows multiples of binary 1024, 2^10 (format_kb default behavior)

Improved method signature, constification of parameter and type

Added unit test for nice_unit_format()

Change nice_unit_format() to long long
- increased variable size to accommodate bigger byte amounts

Merge branch 'rename-user'

Merge branch 'kernel-update'

Conflicts:
miscscripts/miscscripts.spec
packages/buildsys-build-rpmfusion/buildsys-build-rpmfusion-kerneldevpkgs-current

Merge branch 'master'

Merge branch 'fix-logcheck-overflow'

Merge branch 'fix-vpn-outgoing-inet-bad'

Increase version

Merge branch 'kernel-update'

Merge branch 'hdd_serials'

Merge branch 'dyndns-get-IP-from-connd'

Merge branch 'mempool-iocheck'

Make LogLevel::Emergency and LogLevel::Alert usable. Add upper log level limit

Merge branch 'cnfchecker-fail-break'

Conflicts:
configuration/etc/postfix/sender_checks
orga/releasetests/tests-5.3.6.txt

Merge branch 'pc-lint-settings'

Use correct (unsigned) type for string positions

Rename all PC-Lint settings files to pclint.lnt so we can easily find them

Centralized Intranator generic PC-Lint settings

better errormessage in case of invalid range ends

Merge branch 'vpn-nat'

Merge branch 'master' into vpn-nat

Conflicts:
packages/iptables/iptables.spec
packages/strongswan/strongswan.spec
update_cnf/src/Makefile.am

Merge branch 'master' into vpn-nat

Conflicts:
generate/generate/ipsec.ag
generate/generate/make_usedvar.pl
generate/generate/named.ag
miscscripts/miscscripts.spec
packages/buildsys-build-rpmfusion/buildsys-build-rpmfusion-kerneldevpkgs-current
packages/buildsys-build-rpmfusion/buildsys-build-rpmfusion.spec
packages/kernel/kernel-2.6.33.3-i686-smp.config
packages/kernel/kernel-2.6.33.3-i686.config
packages/kernel/kernel-2.6.34-i686-PAE.config
packages/kernel/kernel-2.6.34-i686.config
packages/kernel/kernel-2.6.34.4-i686-PAE.config
packages/kernel/kernel-2.6.34.4-i686.config
packages/kernel/kernel.spec
packages/strongswan/strongswan.spec
ui/ui/form_keys_foreign.cpp
ui/ui/form_vpn_connections.cpp
update_cnf/src/Makefile.am
update_cnf/src/update_5.3.2.cpp

Initialize fd variable in constructor

Adapt to new boost version

swap and operator= for IP_RANGE

add IP_RANGE::netmap including unit tests

Merge branch 'mempool'

Merge branch 'xss-fix'

Reflect initialization order in pipestream constructor: The base class is initialized before the class members

Also filter single quotes and / in html_entities() to prevent XSS attack in normal text

Merge branch 'bpdyndnsd'

Conflicts:
packages/bpdyndnsd/bpdyndnsd-0.1.tar.gz
packages/bpdyndnsd/bpdyndnsd.spec
update_cnf/src/Makefile.am

Merge branch 'kernel-2.6.34' into vpn-nat: vpn-nat needs 2.6.34

Conflicts:
packages/kernel/kernel-2.6.34-i686-PAE.config

Merge branch 'kernel-2.6.34' into vpn-nat

Merge remote branch 'origin/postfwd'

Merge branch 'powersave' (kernel 2.6.33)

Conflicts:
miscscripts/miscscripts.spec
packages/buildsys-build-rpmfusion/buildsys-build-rpmfusion-kerneldevpkgs-current
packages/kernel/kernel-2.6.32.10-i686-smp.config
packages/kernel/kernel-2.6.32.10-i686.config
packages/kernel/kernel-2.6.32.12-i686-smp.config
packages/kernel/kernel-2.6.32.12-i686.config
packages/kernel/kernel-2.6.33.3-i686-smp.config
packages/kernel/kernel-2.6.33.3-i686.config
packages/kernel/kernel.spec

Merge remote branch 'origin/spamassassin'

Conflicts:
sarules/50_i2n_dnsbls_scores.cf
sarules/50_i2n_scores.cf
sarules/add_all_internal.patch

Increase version in own packages

Compile optimized binaries with debug symbols (they'll be moved by rpm to the -debuginfo package)

Merge branch 'master' into powersave

Merge branch 'glibc-upgrade'

add chown to tmpfstreams variants

it's doxygen time

implement dirsync() and syncing on tmpfstreams

allow double-move

implement filemode_on_close, fix var initialization

working version of tmpfcopystream

add TODOs

basic framework for tmpfcopystream, close() is still to do

prevent working on unlinked files

handle openflags in tmpfstream, test rdwr-file

implement unlink and move, add tests for them

- use explicit instantiation for the most-used version of tmpfstream
- split the implementation into a separate header only needed for unusual versions
- most used versions get the typedefs tmpofstream and tmpfstream
- rename the template to tmpfstreamTempl

fix Stat::recheck(), seems like noone ever tested it...

first working version of tmpfstream. Still in need of some polishing

add copy_stream to filefunc and use it in copy_file

Merge remote branch 'origin/amavisd-update' into glibc-upgrade

Conflicts:
generate/generate/amavisd.ag
packages/amavisd-new/amavisd-new-2.3.3-output-msg-status-for-spamfilter-calibration.patch
packages/amavisd-new/amavisd-new.spec
packages/perl-Net-Server/perl-Net-Server.spec
packages/unarj/unarj.spec
spamfilter_calibrator/src/main.cpp

Removed sqlite 3.6.21 from amavisd-update branch
as glibc-upgrade branch already contains 3.6.22.

Merge branch 'boost-test' into glibc-upgrade

Conflicts:
connd/configure.in
libi2ncommon/test/test_cron_interval.cpp
libi2ncommon/test/test_cron_point.cpp
packages/cppunit/cppunit.spec
packages/libt2n/libt2n-0.5.tar.gz
packages/libt2n/libt2n.spec
proxylizer/config.h.in

Merge remote branch 'origin/boost-test' into master-merge-boost-test

Merge remote branch 'origin/master' into glibc-upgrade

Conflicts:
packages/cyrus-imapd/cyrus-imapd.spec
packages/git/git.spec
packages/kernel-2.6/kernel-2.6.spec
sarules/configure.in

Merge remote branch 'origin/master' into glibc-upgrade-merge

Conflicts:
connd/connd/Makefile.am
http_file_upload/http_file_upload.spec
initramfs/configure.in
initramfs/initramfs.spec
initramfs/usr/intranator/bin/initramfs/build_initramfs.sh
initramfs/usr/intranator/bin/initramfs/init
ipsec_exe/ipsec_exe.spec
packages/Mail-SpamAssassin/Mail-SpamAssassin.spec
packages/bind/bind.spec
packages/dhcp/dhcp.spec
packages/dhcpcd/dhcpcd.spec
packages/fetchmail/fetchmail.spec
packages/file/file.spec
packages/gzip/gzip-1.3.5-zforce.patch
packages/gzip/gzip-1.3.9-rsync.patch
packages/gzip/gzip.spec
packages/initscripts/initscripts.spec
packages/kernel-2.6/kernel-2.6.spec
packages/logcheck/logcheck.spec
packages/openssl/openssl.spec
packages/php/php.spec
packages/strongswan/strongswan.spec
sarules/configure.in
sarules_update/sarules_update.spec
trusted_net_helper/trusted_net_helper.spec
update_cnf/src/Makefile.am

Migrate libi2ncommon to boost::test