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 ad279e1234f4a1022027a343edc9aa0480e7d5fe (commit) via 83460ad12427057f220a0203990ded1a4bce6710 (commit) via eccf0dae38f0a6dce1ac7320e5b6a2dedcc9323b (commit) from 4121e158baacff470c2ee8dd5bec852f22e9b1a0 (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 ad279e1234f4a1022027a343edc9aa0480e7d5fe Merge: eccf0da 83460ad Author: Michael Tremer michael.tremer@ipfire.org Date: Tue May 1 15:12:46 2012 +0200

Merge remote-tracking branch 'ms/ncurses-terminfo'

commit 83460ad12427057f220a0203990ded1a4bce6710 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue May 1 13:10:16 2012 +0000

ncurses: Move terminfo files out of /lib.

This is part of the UsrMove process. xterm terminfo files were not in the base package which has been fixed as well.

commit eccf0dae38f0a6dce1ac7320e5b6a2dedcc9323b Author: Michael Tremer michael.tremer@ipfire.org Date: Tue May 1 14:36:23 2012 +0200

openssh: Fix systemd service files.

OpenSSH had problems with starting the daemon after installation. This is now fixed.

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

Summary of changes: ncurses/ncurses.nm | 35 +++++------------------------------ openssh/openssh.nm | 6 ++---- openssh/systemd/sshd-keygen.service | 4 +--- openssh/systemd/sshd.service | 3 ++- openssh/systemd/sshd.socket | 10 ---------- openssh/systemd/sshd@.service | 8 -------- 6 files changed, 10 insertions(+), 56 deletions(-) delete mode 100644 openssh/systemd/sshd.socket delete mode 100644 openssh/systemd/sshd@.service

Difference in files: diff --git a/ncurses/ncurses.nm b/ncurses/ncurses.nm index 683c6a8..35c1cc0 100644 --- a/ncurses/ncurses.nm +++ b/ncurses/ncurses.nm @@ -5,7 +5,7 @@

name = ncurses version = 5.9 -release = 7 +release = 8

groups = System/Base url = http://invisible-island.net/ncurses/ncurses.html @@ -35,7 +35,7 @@ build --enable-hard-tabs \ --enable-xmc-glitch \ --enable-colorfgbg \ - --with-terminfo-dirs=/etc/terminfo:/usr/share/terminfo:/lib/terminfo \ + --with-terminfo-dirs=%{sysconfdir}/terminfo:%{datadir}/terminfo \ --enable-overwrite \ --enable-pc-files \ --with-termlib=tinfo @@ -67,32 +67,7 @@ build

chmod -v 755 %{BUILDROOT}%{libdir}/lib*.so.*.*

- mkdir -pv %{BUILDROOT}/{etc,lib}/terminfo - - # move few basic terminfo entries to /lib - baseterms= - for termname in \ - ansi dumb linux vt100 vt100-nav vt102 vt220 vt52; do - for t in $(find %{BUILDROOT}/usr/share/terminfo \ - -samefile %{BUILDROOT}/usr/share/terminfo/${termname::1}/$termname); do - baseterms="$baseterms $(basename $t)" - done - done - for termname in ${baseterms}; do - termpath=terminfo/${termname::1}/${termname} - mkdir -pv %{BUILDROOT}/lib/terminfo/${termname::1} - mv -v %{BUILDROOT}/usr/share/${termpath} %{BUILDROOT}/lib/${termpath} - ln -svf $(dirname /usr/share/${termpath} | \ - sed 's,(^/|)[^/][^/]*,..,g')/lib/${termpath} \ - %{BUILDROOT}/usr/share//${termpath} - done - - # can't replace directory with symlink, symlink all headers - #mkdir %{BUILDROOT}/usr/include/ncurses{,w} - #for l in %{BUILDROOT}/usr/include/*.h; do - # ln -s ../$(basename $l) %{BUILDROOT}/usr/include/ncurses - # ln -s ../$(basename $l) %{BUILDROOT}/usr/include/ncursesw - #done + mkdir -pv %{BUILDROOT}/etc/terminfo

# don't require -ltinfo when linking with --no-add-needed for l in %{BUILDROOT}%{libdir}/libncurses{,w}.so; do @@ -150,7 +125,6 @@ packages conflicts = ncurses<=5.9-1

files - /lib/terminfo /usr/share/terminfo/*/Eterm* /usr/share/terminfo/*/aterm /usr/share/terminfo/*/bterm @@ -182,7 +156,8 @@ packages /usr/share/terminfo/*/vwmterm /usr/share/terminfo/*/wsvt25* /usr/share/terminfo/*/xfce - /usr/share/terminfo/*/xterm xterm-* + /usr/share/terminfo/*/xterm + /usr/share/terminfo/*/xterm-* end end

diff --git a/openssh/openssh.nm b/openssh/openssh.nm index d04d2b2..b2b90e4 100644 --- a/openssh/openssh.nm +++ b/openssh/openssh.nm @@ -5,7 +5,7 @@

name = openssh version = 5.9p1 -release = 4 +release = 5

groups = Application/Internet url = http://www.openssh.com/portable.html @@ -122,7 +122,7 @@ packages end

script prein - getent group sshd_keys >/dev/null || groupadd -r ssh_keys || : + getent group ssh_keys >/dev/null || groupadd -r ssh_keys end end

@@ -203,9 +203,7 @@ packages

script preun /bin/systemctl --no-reload disable sshd.service >/dev/null 2>&1 || : - /bin/systemctl --no-reload disable sshd-keygen.service >/dev/null 2>&1 || : /bin/systemctl stop sshd.service >/dev/null 2>&1 || : - /bin/systemctl stop sshd-keygen.service >/dev/null 2>&1 || : end

script postun diff --git a/openssh/systemd/sshd-keygen.service b/openssh/systemd/sshd-keygen.service index bfef328..1554c24 100644 --- a/openssh/systemd/sshd-keygen.service +++ b/openssh/systemd/sshd-keygen.service @@ -2,11 +2,9 @@ Description=SSH server keys generation. After=syslog.target Before=sshd.service +BindTo=sshd.service

[Service] Type=oneshot ExecStart=/usr/sbin/sshd-keygen RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/openssh/systemd/sshd.service b/openssh/systemd/sshd.service index 6b90aa1..9007d89 100644 --- a/openssh/systemd/sshd.service +++ b/openssh/systemd/sshd.service @@ -3,7 +3,8 @@ Description=OpenSSH server daemon After=syslog.target network.target auditd.service

[Service] -ExecStart=/usr/sbin/sshd -D $OPTIONS +ExecStartPre=/usr/sbin/sshd-keygen +ExecStart=/usr/sbin/sshd -D ExecReload=/bin/kill -HUP $MAINPID

[Install] diff --git a/openssh/systemd/sshd.socket b/openssh/systemd/sshd.socket deleted file mode 100644 index 94b9533..0000000 --- a/openssh/systemd/sshd.socket +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=OpenSSH Server Socket -Conflicts=sshd.service - -[Socket] -ListenStream=22 -Accept=yes - -[Install] -WantedBy=sockets.target diff --git a/openssh/systemd/sshd@.service b/openssh/systemd/sshd@.service deleted file mode 100644 index 09f995e..0000000 --- a/openssh/systemd/sshd@.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=OpenSSH per-connection server daemon -After=syslog.target auditd.service - -[Service] -EnvironmentFile=/etc/sysconfig/sshd -ExecStart=-/usr/sbin/sshd -i $OPTIONS -StandardInput=socket

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