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-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

Merge branch 'glibc-upgrade' into amavisd-update

Conflicts:
packages/autoconf/autoconf.spec
packages/python/python.spec
packages/sqlite/sqlite.spec

Merge remote branch 'origin/kernel-upgrade'

Merge branch 'dhcpcd-update'

Merge branch 'spamfilter-no-relays'

move exception.hxx from arnieclient into i2ncommon

it is used within i2ncommon so we have circular dependencies. this move fixes it.

move exception.hxx from arnieclient into i2ncommon

it is used within i2ncommon so we have circular dependencies. this move fixes it.

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

Conflicts:
packages/amavisd-new/amavisd-new.spec

Merge remote branch 'origin/glibc-upgrade' into amavisd-update
want to profit from the new developments and make cherry-picking more easy

Conflicts:
packages/amavisd-new/amavisd-new.spec

Merge branch 'strongswan-4.3'

strongswan 4.3 was stable on first tests, just discovered bug #1615. we can fix that in master

Conflicts:
packages/strongswan/strongswan.spec

Merge branch 'master' into glibc-uprade-HEAD-merge

Conflicts:
add_dhcp_client/add_dhcp_client.spec
arniesetup/arniesetup.spec
backup_push/backup_push.spec
check_ip_conflict/check_ip_conflict.spec
configuration/etc/crontab
get_cnf/get_cnf.spec
info_fetchmail/info_fetchmail.spec
info_iponline/info_iponline.spec
initramfs/initramfs.spec
keymgt/keymgt.spec
libcnffile/config.h.in
libcnffile/libcnffile.spec
misc/git_webexport.sh
packages/Mail-SpamAssassin/Mail-SpamAssassin.spec
packages/amavisd-new/amavisd-new.spec
packages/bind/bind.spec
packages/cmake/cmake.spec
packages/curl-ssl/curl-ssl.spec
packages/cyrus-imapd/cyrus-imapd.spec
packages/fetchmail/fetchmail.spec
packages/file/file-disable-msdos-com.patch
packages/file/file.spec
packages/fsav/fsav.spec
packages/fsavpkgupdate/fsavpkgupdate.spec
packages/git/git-mkdtemp-old-glibc.patch
packages/git/git.spec
packages/initscripts/initscripts.spec
packages/iproute/iproute.spec
packages/iptables/iptables.spec
packages/libpng/libpng.spec
packages/libt2n/libt2n.spec
packages/libtiff/libtiff.spec
packages/logcheck/logcheck.spec
packages/newt/newt.spec
packages/openssl/openssl.spec
packages/perl-IO-Socket-SSL/perl-IO-Socket-SSL.spec
packages/perl/perl.spec
packages/php/php.spec
packages/postfix/postfix.spec
packages/samba/samba.spec
packages/squid/squid.spec
packages/squidguard/squidguard.spec
packages/strongswan/strongswan.spec
packages/udev/udev.spec
packages/webmail/webmail.spec
ui/ui/form_antivirus_quarantine.cpp
wol/wol.spec

Merge branch 'vpn-psk-anyid'

Merge remote branch 'origin/update-522'

Merge branch 'iphone-vpn' into update-522

Merge branch 'iphone-vpn' into update-522

Merge remote branch 'origin/iphone-vpn' into update-522

Increase release version for smooth upgrade process. Otherwise dependency calculation will fail

Added libgettex requirement to libi2ncommon

Merge branch 'spamfilter-first-trusted' into master

Conflicts:
intranator-language/usr/intranator/lang/de/LC_MESSAGES/ui-data.mo
intranator-language/usr/intranator/lang/de/LC_MESSAGES/ui-data.po
orga/releasetests/tests-5.1.6.txt
orga/releasetests/tests-5.1.7.txt
packages/Mail-SpamAssassin/Mail-SpamAssassin.spec
packages/logcheck/logcheck-patterns/ignore.d.server/intranator
sarules/50_i2n_scores.cf
sarules/i2n-rules.cf
sarules/ixhash.cf
sarules/sarules.spec
update_cnf/src/update_5.1.7.cpp

Fix pipestream includes

Fix libi2ncommon for gcc4

Re-enable new cron class test results using new glibc

Adjust to libiconv API change

Properly depend on ../utils

Merge branch 'squid-v3' into intranator-next

Merge branch 'master' into squid-v3

Conflicts:
libcnfcheck/src/check_var/cnfcheck_proxy.cpp
libcnfcheck/src/check_var/cnfcheck_system.cpp
libfirewall/src/fw_ruleset_obj.cpp
libfirewall/src/fw_ruleset_obj.hxx
packages/squid/squid.spec

Fix arnied scheduler by redefining StNimmerleinsDay from -1 to INT_MAX -> arnied's scheduler uses signed int to calculate dates

Increase version

Merge commit 'origin/fsav-upgrade'

make sure that no invalid time values are written to firewall (#1423)
new common function split_daysec() to replace the dated seconds_to_hour_minute()

increase libi2ncommon version as it is incompatible after dividing it by licenses, fix libtool build

Change some cron time unit test until we have a fixed glibc

Merge branch 'schedulefix-with-new-glibc'

Relicensed signalfunc and containerfunc as GPL version 2 + linking exception. Moved this submodule to a separate utils directory/RPM package.

fix unit-tests - the results were ok for the new code, remove debugging-output

improve WeekCron-unittests some more

first shot at fixing WeekCron-login, not done yet (#1551)

Merge branch 'strongswan-v4'

Conflicts:
.gitignore
packages/strongswan/strongswan.spec