]> git.ipfire.org Git - people/ms/ipfire-3.x.git/log
people/ms/ipfire-3.x.git
15 years agofindutils: Disable testsuite.
Michael Tremer [Sat, 22 May 2010 21:57:03 +0000 (23:57 +0200)] 
findutils: Disable testsuite.

15 years agoMerge commit 'stevee/updates' into next
Michael Tremer [Sat, 22 May 2010 21:52:01 +0000 (23:52 +0200)] 
Merge commit 'stevee/updates' into next

15 years agolibxml2: Update to version 2.7.7.
Schantl Stefan [Sat, 22 May 2010 21:45:00 +0000 (23:45 +0200)] 
libxml2: Update to version 2.7.7.

15 years agoglib2: Update to version 2.25.6.
Schantl Stefan [Sat, 22 May 2010 21:40:50 +0000 (23:40 +0200)] 
glib2: Update to version 2.25.6.

15 years agoMerge commit 'stevee/updates' into next
Michael Tremer [Sat, 22 May 2010 21:38:33 +0000 (23:38 +0200)] 
Merge commit 'stevee/updates' into next

15 years agoMerge commit 'stevee/upstart' into next
Michael Tremer [Sat, 22 May 2010 21:31:50 +0000 (23:31 +0200)] 
Merge commit 'stevee/upstart' into next

15 years agoiptables: Update to version 1.4.8.
Schantl Stefan [Sat, 22 May 2010 21:26:29 +0000 (23:26 +0200)] 
iptables: Update to version 1.4.8.

15 years agoMerge commit 'stevee/findutils' into next
Michael Tremer [Sat, 22 May 2010 21:25:50 +0000 (23:25 +0200)] 
Merge commit 'stevee/findutils' into next

Conflicts:
pkgs/toolchain/glibc/patches

15 years agoMerge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into updates
Schantl Stefan [Sat, 22 May 2010 21:23:42 +0000 (23:23 +0200)] 
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into updates

15 years agoMerge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into updates
Schantl Stefan [Sat, 22 May 2010 21:23:15 +0000 (23:23 +0200)] 
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into updates

Conflicts:
pkgs/toolchain/glibc/patches

15 years agoupstart: Add upstream patch.
Schantl Stefan [Sat, 22 May 2010 21:15:14 +0000 (23:15 +0200)] 
upstart: Add upstream patch.

This patch adds the upstart-udev-bridge.

* New upstream release:
    - All changes were previously merged into this package.

  * debian/upstart-job:
    - Fix output for the force-reload command to only refer to reload(8).
      LP: #532862.

  * Add debian/source/format with "1.0" to be future compatible.
  * Add missing ${misc:Depends}.
  * Bump standards version.
  * Convert rules to dh7 format.

15 years agolibnih: Add upstream patch.
Schantl Stefan [Sat, 22 May 2010 21:12:38 +0000 (23:12 +0200)] 
libnih: Add upstream patch.

  * New upstream release:
    - Rename AC_COPYRIGHT to NIH_COPYRIGHT to avoid conflict with other
      packages.
    - Add serial to libnih.m4
    - Add NIH_WITH_LOCAL_LIBNIH macro.

  * Fix use of ${Source-Version} to be ${binary:Version}
  * Add debian/source/format with "1.0" to be future compatible.
  * Bump standards version.

15 years agopppd: Add patch to create a new ifname option.
Michael Tremer [Fri, 21 May 2010 23:38:26 +0000 (01:38 +0200)] 
pppd: Add patch to create a new ifname option.

15 years agozlib: Disable parallel build.
Michael Tremer [Fri, 21 May 2010 20:27:09 +0000 (22:27 +0200)] 
zlib: Disable parallel build.

15 years agoMerge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
Michael Tremer [Fri, 21 May 2010 18:46:51 +0000 (20:46 +0200)] 
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next

15 years agoMerge branch 'new-packages' into next
Michael Tremer [Fri, 21 May 2010 18:45:15 +0000 (20:45 +0200)] 
Merge branch 'new-packages' into next

Conflicts:
pkgs/toolchain/glibc/patches

15 years agonaoki: Add reverse dependencies.
Michael Tremer [Thu, 20 May 2010 21:10:19 +0000 (23:10 +0200)] 
naoki: Add reverse dependencies.

15 years agoiproute2: Update to 2.6.34.
Michael Tremer [Wed, 19 May 2010 21:57:43 +0000 (23:57 +0200)] 
iproute2: Update to 2.6.34.

15 years agoperl: Update to 5.12.1.
Michael Tremer [Tue, 18 May 2010 12:20:42 +0000 (14:20 +0200)] 
perl: Update to 5.12.1.

15 years agompc: Update to 0.8.2.
Michael Tremer [Mon, 17 May 2010 22:02:07 +0000 (00:02 +0200)] 
mpc: Update to 0.8.2.

15 years agoperl: Change some configuration options.
Michael Tremer [Sun, 16 May 2010 22:05:46 +0000 (00:05 +0200)] 
perl: Change some configuration options.

15 years agoMerge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
Michael Tremer [Sun, 16 May 2010 21:21:47 +0000 (23:21 +0200)] 
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next

15 years agotoolchain: Install all locales in toolchain (experimental).
Michael Tremer [Sun, 16 May 2010 21:21:20 +0000 (23:21 +0200)] 
toolchain: Install all locales in toolchain (experimental).

15 years agom4: Disable testsuite.
Michael Tremer [Sun, 16 May 2010 09:33:14 +0000 (11:33 +0200)] 
m4: Disable testsuite.

15 years agodiffutils: Disable testsuite.
Michael Tremer [Sat, 15 May 2010 21:42:45 +0000 (23:42 +0200)] 
diffutils: Disable testsuite.

The gnulib testsuite fails.

15 years agoxfsprogs: Update to 3.1.2.
Michael Tremer [Sat, 15 May 2010 21:04:14 +0000 (23:04 +0200)] 
xfsprogs: Update to 3.1.2.

15 years agoqemu: Changes on CFLAGS to prevent a build error.
Michael Tremer [Sat, 15 May 2010 20:07:35 +0000 (22:07 +0200)] 
qemu: Changes on CFLAGS to prevent a build error.

15 years agoqemu: Update to 0.12.4.
Michael Tremer [Sat, 15 May 2010 18:27:47 +0000 (20:27 +0200)] 
qemu: Update to 0.12.4.

15 years agoMerge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
Michael Tremer [Fri, 14 May 2010 23:00:46 +0000 (01:00 +0200)] 
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next

15 years agoglibc: Remove that definition subset of locales.
Michael Tremer [Fri, 14 May 2010 10:32:19 +0000 (12:32 +0200)] 
glibc: Remove that definition subset of locales.

15 years agocoreutils: Disable testsuite.
Michael Tremer [Fri, 14 May 2010 10:31:15 +0000 (12:31 +0200)] 
coreutils: Disable testsuite.

 INFO    ====================================================
 INFO       GNU coreutils 8.5: gnulib-tests/test-suite.log
 INFO    ====================================================
 INFO    4 of 203 tests failed.  (2 tests were not run).
 INFO    .. contents:: :depth: 2
 INFO    FAIL: test-linkat (exit: 134)
 INFO    =============================
 INFO    test-linkat.c:73: assertion failed
 INFO    FAIL: test-mbrtowc3.sh (exit: 134)
 INFO    ==================================
 INFO    test-mbrtowc.c:235: assertion failed
 INFO    ./test-mbrtowc3.sh: line 15: 13257 Aborted                 LC_ALL=$LOCALE_JA ./test-mbrtowc${EXEEXT} 3
 INFO    FAIL: test-mbsrtowcs3.sh (exit: 134)
 INFO    ====================================
 INFO    test-mbsrtowcs.c:202: assertion failed
 INFO    ./test-mbsrtowcs3.sh: line 15: 13354 Aborted                 LC_ALL=$LOCALE_JA ./test-mbsrtowcs${EXEEXT} 3
 INFO    SKIP: test-vc-list-files-git.sh (exit: 77)
 INFO    ==========================================
 INFO    Skipping test: git not found in PATH
 INFO    SKIP: test-vc-list-files-cvs.sh (exit: 77)
 INFO    ==========================================
 INFO    Skipping test: cvs not found in PATH
 INFO    FAIL: test-wcrtomb.sh (exit: 1)
 INFO    ===============================
 INFO    test-wcrtomb.c:45: assertion failed
 INFO    ./test-wcrtomb.sh: line 25: 14767 Aborted                 LC_ALL=$LOCALE_JA ./test-wcrtomb${EXEEXT} 3
 INFO    ======================================
 INFO    4 of 203 tests failed
 INFO    (2 tests were not run)
 INFO    See gnulib-tests/test-suite.log
 INFO    Please report to bug-coreutils@gnu.org
 INFO    ======================================

15 years agoMerge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
Michael Tremer [Fri, 14 May 2010 10:22:12 +0000 (12:22 +0200)] 
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next

Conflicts:
pkgs/toolchain/glibc/patches

15 years agotoolchain: Bump version to 3.
Michael Tremer [Fri, 14 May 2010 08:05:33 +0000 (10:05 +0200)] 
toolchain: Bump version to 3.

15 years agotoolchain: Remove some unneeded files like the static libs.
Michael Tremer [Fri, 14 May 2010 08:05:15 +0000 (10:05 +0200)] 
toolchain: Remove some unneeded files like the static libs.

15 years agotoolchain: Sync patches.
Michael Tremer [Fri, 14 May 2010 08:04:57 +0000 (10:04 +0200)] 
toolchain: Sync patches.

15 years agoppp: Update to 2.4.5.
Michael Tremer [Fri, 14 May 2010 00:03:13 +0000 (02:03 +0200)] 
ppp: Update to 2.4.5.

15 years agobtrfs-progs: Add build fix patch (glibc-2.12).
Michael Tremer [Thu, 13 May 2010 23:46:55 +0000 (01:46 +0200)] 
btrfs-progs: Add build fix patch (glibc-2.12).

15 years agostrongswan: Update to version 4.4.0.
Schantl Stefan [Thu, 13 May 2010 18:17:58 +0000 (20:17 +0200)] 
strongswan: Update to version 4.4.0.

15 years agofindutils: Activate Testsuite.
Schantl Stefan [Thu, 13 May 2010 18:10:03 +0000 (20:10 +0200)] 
findutils: Activate Testsuite.

15 years agofindutils: Clean up Naoki Makefile.
Schantl Stefan [Thu, 13 May 2010 18:08:02 +0000 (20:08 +0200)] 
findutils: Clean up Naoki Makefile.

15 years agofindutils: Update to version 4.5.9.
Schantl Stefan [Thu, 13 May 2010 18:07:34 +0000 (20:07 +0200)] 
findutils: Update to version 4.5.9.

15 years agogrub: Add dependecy to os-prober.
Michael Tremer [Thu, 13 May 2010 14:54:33 +0000 (16:54 +0200)] 
grub: Add dependecy to os-prober.

This will enable grub-mkconfig to autodetect other
operating systems installed on the computer.

15 years agoos-prober: New package.
Michael Tremer [Thu, 13 May 2010 14:45:12 +0000 (16:45 +0200)] 
os-prober: New package.

15 years agonaoki: Fix warnings by pychecker.
Michael Tremer [Thu, 13 May 2010 11:38:47 +0000 (13:38 +0200)] 
naoki: Fix warnings by pychecker.

15 years agotoolchain: Sync patches of glibc and make.
Michael Tremer [Thu, 13 May 2010 11:14:13 +0000 (13:14 +0200)] 
toolchain: Sync patches of glibc and make.

15 years agonaoki: Use pigz for toolchain decompression if available.
Michael Tremer [Thu, 13 May 2010 11:13:38 +0000 (13:13 +0200)] 
naoki: Use pigz for toolchain decompression if available.

15 years agomake: Fix build issues and apply some patches.
Michael Tremer [Thu, 13 May 2010 09:40:26 +0000 (11:40 +0200)] 
make: Fix build issues and apply some patches.

15 years agonaoki: Log output of toolchains commands.
Michael Tremer [Thu, 13 May 2010 08:33:10 +0000 (10:33 +0200)] 
naoki: Log output of toolchains commands.

15 years agotoolchain: Fix typo for stripping the toolchain.
Michael Tremer [Thu, 13 May 2010 08:32:43 +0000 (10:32 +0200)] 
toolchain: Fix typo for stripping the toolchain.

15 years agom4: Add patch for build fix with glibc-2.12.
Michael Tremer [Thu, 13 May 2010 08:32:10 +0000 (10:32 +0200)] 
m4: Add patch for build fix with glibc-2.12.

15 years agogrub: Add patch for better detection of initramfses.
Michael Tremer [Thu, 13 May 2010 00:13:25 +0000 (02:13 +0200)] 
grub: Add patch for better detection of initramfses.

15 years agoglibc: Update to 2.12.
Michael Tremer [Thu, 13 May 2010 00:06:51 +0000 (02:06 +0200)] 
glibc: Update to 2.12.

15 years agoMerge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
Michael Tremer [Wed, 12 May 2010 22:48:48 +0000 (00:48 +0200)] 
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next

15 years agogettext: Update to 0.18.
Michael Tremer [Wed, 12 May 2010 22:47:32 +0000 (00:47 +0200)] 
gettext: Update to 0.18.

15 years agonaoki: Another log mail fix.
Michael Tremer [Wed, 12 May 2010 21:55:16 +0000 (23:55 +0200)] 
naoki: Another log mail fix.

15 years agonetwork: Remove support for blue zone.
Michael Tremer [Wed, 12 May 2010 18:25:01 +0000 (20:25 +0200)] 
network: Remove support for blue zone.

15 years agofirewall: Remove support for blue zone.
Michael Tremer [Wed, 12 May 2010 18:22:40 +0000 (20:22 +0200)] 
firewall: Remove support for blue zone.

15 years agokernel: Changes on files placed to /boot.
Michael Tremer [Wed, 12 May 2010 18:10:31 +0000 (20:10 +0200)] 
kernel: Changes on files placed to /boot.

The kernel itself is name vmlinuz-2.6.x..
and there is no symlink "vmlinuz".

This will work much better with grub2.

15 years agomemtest86+: Update to 4.10.
Michael Tremer [Wed, 12 May 2010 15:57:35 +0000 (17:57 +0200)] 
memtest86+: Update to 4.10.

Adds support for grub2.

15 years agosystem-release: Fix spelling of "Release" -> "release".
Michael Tremer [Wed, 12 May 2010 15:30:37 +0000 (17:30 +0200)] 
system-release: Fix spelling of "Release" -> "release".

15 years agoMerge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
Michael Tremer [Wed, 12 May 2010 15:28:20 +0000 (17:28 +0200)] 
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next

15 years agonaoki: Automatically install "default" files.
Michael Tremer [Wed, 12 May 2010 15:27:50 +0000 (17:27 +0200)] 
naoki: Automatically install "default" files.

15 years agogrub: Update some settings.
Michael Tremer [Wed, 12 May 2010 15:27:18 +0000 (17:27 +0200)] 
grub: Update some settings.

Provide a file with default settings and add some
more configuration parameters.

15 years agogrub: Don't install legacy configuration file.
Michael Tremer [Wed, 12 May 2010 12:04:00 +0000 (14:04 +0200)] 
grub: Don't install legacy configuration file.

15 years agoMerge branches 'master' and 'master' of ssh://ms@git.ipfire.org/pub/git/people/ms...
Michael Tremer [Tue, 11 May 2010 20:35:19 +0000 (22:35 +0200)] 
Merge branches 'master' and 'master' of ssh://ms@git.ipfire.org/pub/git/people/ms/ipfire-3.x into next

15 years agopdns-recursor: As the old version does not build with newer boost we need to update...
Michael Tremer [Tue, 11 May 2010 20:34:09 +0000 (22:34 +0200)] 
pdns-recursor: As the old version does not build with newer boost we need to update this.

15 years agonaoki: Fix logging again.
Michael Tremer [Tue, 11 May 2010 12:54:08 +0000 (14:54 +0200)] 
naoki: Fix logging again.

15 years agoMerge branch 'master' of ssh://ms@git.ipfire.org/pub/git/people/ms/ipfire-3.x into...
Michael Tremer [Mon, 10 May 2010 23:30:05 +0000 (01:30 +0200)] 
Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/people/ms/ipfire-3.x into next

15 years agoboost: Update to 1.41.0.
Michael Tremer [Mon, 10 May 2010 23:28:45 +0000 (01:28 +0200)] 
boost: Update to 1.41.0.

15 years agoMerge branch 'master' of ssh://ms@git.ipfire.org/pub/git/people/ms/ipfire-3.x into...
Michael Tremer [Mon, 10 May 2010 23:25:19 +0000 (01:25 +0200)] 
Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/people/ms/ipfire-3.x into next

15 years agodirectfb: Remove libpng support which is currently broken.
Michael Tremer [Mon, 10 May 2010 22:49:21 +0000 (00:49 +0200)] 
directfb: Remove libpng support which is currently broken.

15 years agoMerge branch 'next'
Michael Tremer [Mon, 10 May 2010 22:22:43 +0000 (00:22 +0200)] 
Merge branch 'next'

15 years agocairo: Build fix for new libpng version.
Michael Tremer [Mon, 10 May 2010 22:05:24 +0000 (00:05 +0200)] 
cairo: Build fix for new libpng version.

15 years agoMerge branch 'master' of ssh://ms@git.ipfire.org/pub/git/people/ms/ipfire-3.x into...
Michael Tremer [Mon, 10 May 2010 00:40:16 +0000 (02:40 +0200)] 
Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/people/ms/ipfire-3.x into next

15 years agoMerge branch 'next'
Michael Tremer [Sun, 9 May 2010 23:53:14 +0000 (01:53 +0200)] 
Merge branch 'next'

15 years agoMerge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
Michael Tremer [Sun, 9 May 2010 23:53:02 +0000 (01:53 +0200)] 
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

15 years agoMerge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
Michael Tremer [Sun, 9 May 2010 23:05:32 +0000 (01:05 +0200)] 
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

15 years agocmake: New package.
Michael Tremer [Sun, 9 May 2010 22:51:24 +0000 (00:51 +0200)] 
cmake: New package.

15 years agopdns-recursor: Change configdir to /etc/pdns-recursor, was /etc/powerdns.
Michael Tremer [Sun, 9 May 2010 22:48:56 +0000 (00:48 +0200)] 
pdns-recursor: Change configdir to /etc/pdns-recursor, was /etc/powerdns.

15 years agopdns-recursor: Remove profiling from CFLAGS.
Michael Tremer [Sun, 9 May 2010 22:47:28 +0000 (00:47 +0200)] 
pdns-recursor: Remove profiling from CFLAGS.

15 years agoacpid: Apply some configuration to shutdown the system when pressing the power button.
Michael Tremer [Sun, 9 May 2010 20:33:15 +0000 (22:33 +0200)] 
acpid: Apply some configuration to shutdown the system when pressing the power button.

15 years agoacpid: New package.
Michael Tremer [Sun, 9 May 2010 20:20:35 +0000 (22:20 +0200)] 
acpid: New package.

15 years agonet-snmpd: Add upstart jobfile.
Schantl Stefan [Sun, 9 May 2010 16:53:11 +0000 (18:53 +0200)] 
net-snmpd: Add upstart jobfile.

15 years agoradvd: Add upstart jobfile.
Schantl Stefan [Sun, 9 May 2010 16:40:19 +0000 (18:40 +0200)] 
radvd: Add upstart jobfile.

15 years agoRevert "pdns-recursor: Update to version 3.2."
Michael Tremer [Sun, 9 May 2010 12:57:17 +0000 (14:57 +0200)] 
Revert "pdns-recursor: Update to version 3.2."

This reverts commit bdacf3b368a931594fe89aa40d4b7f404f8026cd.

pdns_recursor gets a SEGV when it is started and I cannot
figure out the reasons.

15 years agodiffutils: Update to version 3.0.
Schantl Stefan [Sun, 9 May 2010 11:29:14 +0000 (13:29 +0200)] 
diffutils: Update to version 3.0.

15 years agosquid: Revomve empty and useless directory /var/logs.
Schantl Stefan [Mon, 26 Apr 2010 21:08:07 +0000 (23:08 +0200)] 
squid: Revomve empty and useless directory /var/logs.

15 years agolibpng: Port pngconf patch to new version.
Schantl Stefan [Sun, 9 May 2010 11:20:58 +0000 (13:20 +0200)] 
libpng: Port pngconf patch to new version.

15 years agogawk: Update to version 3.1.8.
Schantl Stefan [Sun, 9 May 2010 11:06:01 +0000 (13:06 +0200)] 
gawk: Update to version 3.1.8.

15 years agolibpng: Update to version 1.4.2.
Schantl Stefan [Sat, 8 May 2010 15:23:13 +0000 (17:23 +0200)] 
libpng: Update to version 1.4.2.

15 years agopomona: Depends on pakfire.
Michael Tremer [Sat, 8 May 2010 13:21:46 +0000 (15:21 +0200)] 
pomona: Depends on pakfire.

15 years agocracklib: Fix for creating the dict.
Michael Tremer [Sat, 8 May 2010 13:21:19 +0000 (15:21 +0200)] 
cracklib: Fix for creating the dict.

15 years agopolkit: Remove usage of gobject-introspection.
Michael Tremer [Sat, 8 May 2010 10:24:29 +0000 (12:24 +0200)] 
polkit: Remove usage of gobject-introspection.

15 years agolibvirt: Correct the usage of /usr/libexec.
Michael Tremer [Sat, 8 May 2010 10:24:02 +0000 (12:24 +0200)] 
libvirt: Correct the usage of /usr/libexec.

15 years agofuse: Update to version 2.8.4.
Schantl Stefan [Sat, 8 May 2010 07:17:04 +0000 (09:17 +0200)] 
fuse: Update to version 2.8.4.

15 years agontp: Update to version 4.2.6p1.
Schantl Stefan [Sat, 8 May 2010 07:15:02 +0000 (09:15 +0200)] 
ntp: Update to version 4.2.6p1.

15 years agomc: Update to version 4.7.2.
Schantl Stefan [Sat, 8 May 2010 07:06:15 +0000 (09:06 +0200)] 
mc: Update to version 4.7.2.

15 years agoMerge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
Michael Tremer [Fri, 7 May 2010 16:03:26 +0000 (18:03 +0200)] 
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

15 years agoMerge branch 'next'
Michael Tremer [Fri, 7 May 2010 14:15:24 +0000 (16:15 +0200)] 
Merge branch 'next'

15 years agoMerge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
Michael Tremer [Fri, 7 May 2010 14:09:46 +0000 (16:09 +0200)] 
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

Conflicts:
tools/quality-agent.d/095-directory-layout