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 3d10b5cd31eb3a8592eb0470a0631f689a253d14 (commit) via 00c2dfaa9e44caf658669040a86ab51addea0901 (commit) via c288ae89254faf89c28de072b1655c2c8e645c57 (commit) via 4d26274c5b9b5f970b1d2a7d8afb6e7cef0323d5 (commit) from dc22ea774c782d6e861f65d82a38e8f5f3146986 (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 3d10b5cd31eb3a8592eb0470a0631f689a253d14 Merge: 00c2dfa c288ae8 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 4 20:33:56 2012 +0100

Merge remote-tracking branch 'stevee/nss'

commit 00c2dfaa9e44caf658669040a86ab51addea0901 Merge: dc22ea7 4d26274 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 4 20:33:45 2012 +0100

Merge remote-tracking branch 'stevee/openssh'

commit c288ae89254faf89c28de072b1655c2c8e645c57 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Mar 4 20:26:33 2012 +0100

nss: Improve package / Fix dlopen issue.

* nss-libs now requires nss-softokn and nss-softokn-freebl, to solve a problem with dlopen. * Add url for source downloading. * Make myself to the package maintainer.

commit 4d26274c5b9b5f970b1d2a7d8afb6e7cef0323d5 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Feb 26 16:54:36 2012 +0100

openssh: Change syntax of prerequires.

The old format is deprecated.

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

Summary of changes: nss/nss.nm | 15 +++++++++++++-- openssh/openssh.nm | 7 +++++-- 2 files changed, 18 insertions(+), 4 deletions(-)

Difference in files: diff --git a/nss/nss.nm b/nss/nss.nm index 7874035..20acaf9 100644 --- a/nss/nss.nm +++ b/nss/nss.nm @@ -4,9 +4,13 @@ ###############################################################################

name = nss -version = 3.13.1 -release = 2 +ver_major = 3 +ver_minor = 13 +ver_patch = 1 +version = %{ver_major}.%{ver_minor}.%{ver_patch} +release = 3

+maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Libraries url = http://www.mozilla.org/projects/security/pki/nss/ license = MPLv1.1 or GPLv2+ or LGPLv2+ @@ -23,6 +27,8 @@ end sources += \ %{name}-pem-20100809.tar.bz2

+source_dl = ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_%{ver_major}_%{ver_minor}_%{ver_patch}_RTM/src/ + build requires chrpath @@ -177,6 +183,11 @@ packages package %{name}-libs template LIBS

+ requires + nss-softokn=%{thisver} + nss-softokn-freebl=%{thisver} + end + files %{libdir}/*.so end diff --git a/openssh/openssh.nm b/openssh/openssh.nm index 199ed10..0b0250c 100644 --- a/openssh/openssh.nm +++ b/openssh/openssh.nm @@ -5,7 +5,7 @@

name = openssh version = 5.9p1 -release = 2 +release = 3

groups = Application/Internet url = http://www.openssh.com/portable.html @@ -153,7 +153,10 @@ packages /etc/ssh/sshd_config end

- prerequires = shadow-utils systemd-units + prerequires + shadow-utils + systemd-units + end

script prein # Create unprivileged user and group.

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