This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via b60a4efcd4cfeb298e4c6e393a950e5b27712d19 (commit) via 4d4a3454173ea39e93f89e37f0f6d96466a2058b (commit) via 61a17f839e42260435d494989d49d716a2bb58c5 (commit) via 91e84366671821a8210fa04392906d43c9f356d2 (commit) via 1432fd3522b178ddb6d3b389fd625d04c059d61b (commit) via 745379c6362a63e9e55ce734930fef85be9c151b (commit) via 69db94b26b7afc5df08a62bdea04d2c4132ce560 (commit) via c0a8c22d5c2f0a22f512d24fc3203ed716cf6ff6 (commit) from ad279e1234f4a1022027a343edc9aa0480e7d5fe (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit b60a4efcd4cfeb298e4c6e393a950e5b27712d19 Merge: 4d4a345 1432fd3 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed May 2 15:30:50 2012 +0200

Merge remote-tracking branch 'maniacikarus/samba'

commit 4d4a3454173ea39e93f89e37f0f6d96466a2058b Merge: 61a17f8 91e8436 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed May 2 15:30:45 2012 +0200

Merge remote-tracking branch 'stevee/dmraid'

commit 61a17f839e42260435d494989d49d716a2bb58c5 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed May 2 15:29:07 2012 +0200

lvm2: Fix packaging the .pc files on x86_64.

commit 91e84366671821a8210fa04392906d43c9f356d2 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue May 1 21:05:48 2012 +0200

dmraid: Also install shared library.

We now install a correct versioned shared library.

commit 1432fd3522b178ddb6d3b389fd625d04c059d61b Author: Christian Schmidt christian.schmidt@ipfire.org Date: Tue May 1 15:07:22 2012 +0200

samba: Remove the pidfiles from systemd file since they are not needed and services are not correctly started by systemd under some cirustances

commit 745379c6362a63e9e55ce734930fef85be9c151b Merge: 69db94b 371d4b9 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Tue May 1 15:02:18 2012 +0200

Merge branch 'master' into samba

commit 69db94b26b7afc5df08a62bdea04d2c4132ce560 Merge: c0a8c22 5dfd48b Author: Christian Schmidt christian.schmidt@ipfire.org Date: Mon Apr 30 19:14:38 2012 +0200

Merge branch 'master' into samba

commit c0a8c22d5c2f0a22f512d24fc3203ed716cf6ff6 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Mon Apr 30 14:58:13 2012 +0200

samba: Updated to version 3.6.5.

This release fixes CVE-2012-2111.

-----------------------------------------------------------------------

Summary of changes: dmraid/dmraid.nm | 8 ++++++++ lvm2/lvm2.nm | 3 ++- samba/samba.nm | 2 +- samba/systemd/nmb.service | 1 - samba/systemd/smb.service | 1 - samba/systemd/winbind.service | 1 - 6 files changed, 11 insertions(+), 5 deletions(-)

Difference in files: diff --git a/dmraid/dmraid.nm b/dmraid/dmraid.nm index f0fbf17..67df612 100644 --- a/dmraid/dmraid.nm +++ b/dmraid/dmraid.nm @@ -37,6 +37,8 @@ build --disable-static_link \ --enable-libselinux

+ # Dmraid doesn't automatically build and install a versioned library + # so we do it on or own. build_cmds make -C lib libdmraid.so end @@ -45,6 +47,12 @@ build # Install development headers. mkdir -pv %{BUILDROOT}%{includedir}/dmraid install -m 644 include/dmraid/*.h %{BUILDROOT}%{includedir}/dmraid/ + + # Manually install versioned library and create symlinks. + mkdir -pv %{BUILDROOT}%{libdir} + install -m 755 lib/libdmraid.so %{BUILDROOT}%{libdir}/libdmraid.so.%{version} + ln -sv libdmraid.so.%{version} %{BUILDROOT}%{libdir}/libdmraid.so.1 + ln -sv libdmraid.so.%{version} %{BUILDROOT}%{libdir}/libdmraid.so end end

diff --git a/lvm2/lvm2.nm b/lvm2/lvm2.nm index 49b4828..babc5d7 100644 --- a/lvm2/lvm2.nm +++ b/lvm2/lvm2.nm @@ -5,7 +5,7 @@

name = lvm2 version = 2.02.95 -release = 1 +release = 2 thisapp = LVM2.%{version}

groups = System/Base @@ -34,6 +34,7 @@ build end

configure_options += \ + --with-usrlibdir=%{libdir} \ --enable-pkgconfig end

diff --git a/samba/samba.nm b/samba/samba.nm index 3ca947a..75274f2 100644 --- a/samba/samba.nm +++ b/samba/samba.nm @@ -5,7 +5,7 @@

name = samba version = 3.6.5 -release = 1 +release = 2

maintainer = Christian Schmidt christian.schmidt@ipfire.org groups = Networking/Daemons diff --git a/samba/systemd/nmb.service b/samba/systemd/nmb.service index 0dca74c..b0b447e 100644 --- a/samba/systemd/nmb.service +++ b/samba/systemd/nmb.service @@ -4,7 +4,6 @@ After=syslog.target network.target

[Service] Type=forking -PIDFile=/run/nmbd.pid ExecStart=/usr/sbin/nmbd

[Install] diff --git a/samba/systemd/smb.service b/samba/systemd/smb.service index 4f09a4d..b62df5c 100644 --- a/samba/systemd/smb.service +++ b/samba/systemd/smb.service @@ -4,7 +4,6 @@ After=syslog.target network.target nmb.service winbind.service

[Service] Type=forking -PIDFile=/run/smbd.pid LimitNOFILE=16384 ExecStart=/usr/sbin/smbd

diff --git a/samba/systemd/winbind.service b/samba/systemd/winbind.service index 39cbf53..5ae1c2f 100644 --- a/samba/systemd/winbind.service +++ b/samba/systemd/winbind.service @@ -4,7 +4,6 @@ After=syslog.target network.target nmb.service

[Service] Type=forking -PIDFile=/run/winbindd.pid ExecStart=/usr/sbin/winbindd

[Install]

hooks/post-receive -- IPFire 3.x development tree