[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 143bb5b58b5fc79b62a300b030bd9b657277056b - IPFire-SCM

12 Apr 2011

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  143bb5b58b5fc79b62a300b030bd9b657277056b (commit)
       via  cbd85b5489a4fef875682f0ad189a771f636cf67 (commit)
       via  6dc7d50b97cddf20c3d24c3a17c1811f72ab5ec8 (commit)
       via  21580473b9ba9c2f35d7afbcd8ba5acbf9b347c1 (commit)
       via  8c1aa7e7aaa899f726fc1cf72f3f7e5c56cc135c (commit)
       via  6d7556c7e01c729b8e809f96ce28b6c624129d06 (commit)
       via  99c4205229703015aea6f771dd9bd49a8492d28c (commit)
       via  f2e9616d62965e3c68b333f6a1e61fafaaf14b92 (commit)
       via  a6027af6f03209c129f74769e42da3e24c9c29e8 (commit)
      from  70b02277fb3fc98932c3cc23fcb5a7eb2d6ad7e8 (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 143bb5b58b5fc79b62a300b030bd9b657277056b
Merge: cbd85b5 99c4205
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Apr 12 13:55:29 2011 +0200
Merge remote-tracking branch 'stevee/openssh'
commit cbd85b5489a4fef875682f0ad189a771f636cf67
Merge: 6dc7d50 6d7556c
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Apr 12 13:55:17 2011 +0200
Merge remote-tracking branch 'stevee/acpid'
commit 6dc7d50b97cddf20c3d24c3a17c1811f72ab5ec8
Merge: 2158047 f2e9616
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Apr 12 13:54:44 2011 +0200
Merge remote-tracking branch 'stevee/systemd-update'
commit 21580473b9ba9c2f35d7afbcd8ba5acbf9b347c1
Merge: 70b0227 8c1aa7e
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Apr 12 12:31:52 2011 +0200
Merge remote-tracking branch 'maniacikarus/libusb'
commit 8c1aa7e7aaa899f726fc1cf72f3f7e5c56cc135c
Author: Christian Schmidt maniacikarus@ipfire.org
Date:   Sat Apr 9 12:56:12 2011 +0200
libusb: Update to current version 1.0.8.
commit 6d7556c7e01c729b8e809f96ce28b6c624129d06
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Apr 8 22:43:40 2011 +0200
acpid: Add systemd unit file.
References #153.
commit 99c4205229703015aea6f771dd9bd49a8492d28c
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Apr 8 21:44:52 2011 +0200
openssh: Add systemd unit file.
References #153.
commit f2e9616d62965e3c68b333f6a1e61fafaaf14b92
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Apr 8 20:32:47 2011 +0200
systemd: Remove configure flag for syslog service.
commit a6027af6f03209c129f74769e42da3e24c9c29e8
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Apr 8 20:31:43 2011 +0200
systemd: Update to version 24.
-----------------------------------------------------------------------
Summary of changes:
 pkgs/acpid/acpid.init                              |    8 -------
 pkgs/acpid/acpid.nm                                |    2 +-
 pkgs/acpid/power.sh                                |    2 +-
 pkgs/acpid/systemd/acpid.service                   |   18 +++++++++++++++
 pkgs/libusb/libusb.nm                              |    4 +-
 pkgs/openssh/openssh.init                          |   15 -------------
 pkgs/openssh/openssh.nm                            |    8 +++++-
 pkgs/openssh/ssh-keygen                            |    8 +++++++
 pkgs/openssh/systemd/openssh.service               |   11 +++++++++
 ...manpages.patch => systemd-24-no-manpages.patch} |   12 ++++++----
 pkgs/systemd/systemd.nm                            |   23 +++++++++----------
 11 files changed, 65 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/acpid/acpid.init
 create mode 100644 pkgs/acpid/systemd/acpid.service
 delete mode 100644 pkgs/openssh/openssh.init
 create mode 100644 pkgs/openssh/ssh-keygen
 create mode 100644 pkgs/openssh/systemd/openssh.service
 rename pkgs/systemd/patches/{systemd-22-no-manpages.patch => systemd-24-no-manpages.patch} (88%)
Difference in files:

diff --git a/pkgs/acpid/acpid.init b/pkgs/acpid/acpid.init
deleted file mode 100644
index 111bf47..0000000
--- a/pkgs/acpid/acpid.init
+++ /dev/null
@@ -1,8 +0,0 @@
-description		"Start the ACPI daemon"
-author			"IPFire Team"
-
-start on stopped mountfs
-stop on kill-all-services
-
-exec /usr/sbin/acpid -f
-respawn
diff --git a/pkgs/acpid/acpid.nm b/pkgs/acpid/acpid.nm
index e0543c2..876aa25 100644
--- a/pkgs/acpid/acpid.nm
+++ b/pkgs/acpid/acpid.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = acpid
 PKG_VER        = 2.0.8
-PKG_REL        = 1
+PKG_REL        = 2
PKG_MAINTAINER =
 PKG_GROUPS     = Base System/Daemons
diff --git a/pkgs/acpid/power.sh b/pkgs/acpid/power.sh
index c279e4c..4fb9ae0 100755
--- a/pkgs/acpid/power.sh
+++ b/pkgs/acpid/power.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
# Shutdown the system immediately
-initctl emit shutdown
+shudown -h now
diff --git a/pkgs/acpid/systemd/acpid.service b/pkgs/acpid/systemd/acpid.service
new file mode 100644
index 0000000..553b3e2
--- /dev/null
+++ b/pkgs/acpid/systemd/acpid.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=ACPI Event Daemon
+After=syslog.target
+
+# This could probably benefit from socket activation, but honestly I think it
+# is time for acpid to go away, and hence I am not planning to spend the time
+# to add socket activation here. We use Type=forking to ensure that the
+# communication sockets are in place before boot proceeds with any service
+# needing this service. Would acpid support socket activation we could use
+# Type=simple here.
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/sysconfig/acpid
+ExecStart=/usr/sbin/acpid $OPTIONS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pkgs/libusb/libusb.nm b/pkgs/libusb/libusb.nm
index 26c4651..eb1b398 100644
--- a/pkgs/libusb/libusb.nm
+++ b/pkgs/libusb/libusb.nm
@@ -25,8 +25,8 @@
 include $(PKGROOT)/Include
PKG_NAME       = libusb
-PKG_VER        = 1.0.2
-PKG_REL        = 0
+PKG_VER        = 1.0.8
+PKG_REL        = 1
PKG_MAINTAINER =
 PKG_GROUPS     = System/Libraries
diff --git a/pkgs/openssh/openssh.init b/pkgs/openssh/openssh.init
deleted file mode 100644
index f0e7717..0000000
--- a/pkgs/openssh/openssh.init
+++ /dev/null
@@ -1,15 +0,0 @@
-description		"OpenSSH Server"
-author			"IPFire Team"
-
-start on started network
-stop on kill-all-network-services or stopping network
-
-pre-start script
-	for algo in dsa rsa ecdsa; do
-		[ -e "/etc/ssh/ssh_host_${algo}_key" ] && continue
-		/usr/bin/ssh-keygen -q -t ${algo} -N "" -f /etc/ssh/ssh_host_${algo}_key
-	done
-end script
-
-exec /usr/sbin/sshd -D
-respawn
diff --git a/pkgs/openssh/openssh.nm b/pkgs/openssh/openssh.nm
index a7f8de6..88e54c8 100644
--- a/pkgs/openssh/openssh.nm
+++ b/pkgs/openssh/openssh.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = openssh
 PKG_VER        = 5.8p1
-PKG_REL        = 5
+PKG_REL        = 6
PKG_MAINTAINER =
 PKG_GROUPS     = Application/Internet
@@ -107,5 +107,9 @@ CONFIGURE_OPTIONS += \
define STAGE_INSTALL_CMDS
    -mkdir -pv $(BUILDROOT)/etc/ssh
-	cp -vf $(DIR_SOURCE)/sshd_config $(BUILDROOT)/etc/ssh/sshd_config
+	cp -vf $(DIR5_SOURCE)/sshd_config $(BUILDROOT)/etc/ssh/sshd_config
+
+	# Install scriptfile for key generation
+	install -m 754 $(DIR_SOURCE)/ssh-keygen $(BUILDROOT)/usr/lib/openssh/
 endef
+
diff --git a/pkgs/openssh/ssh-keygen b/pkgs/openssh/ssh-keygen
new file mode 100644
index 0000000..46e64d6
--- /dev/null
+++ b/pkgs/openssh/ssh-keygen
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+# Generates keyfiles for defined algorithm
+for algo in dsa rsa ecdsa; do
+	[ -e "/etc/ssh/ssh_host_${algo}_key" ] && continue
+	/usr/bin/ssh-keygen -q -t ${algo} -N "" -f /etc/ssh/ssh_host_${algo}_key
+done
+
diff --git a/pkgs/openssh/systemd/openssh.service b/pkgs/openssh/systemd/openssh.service
new file mode 100644
index 0000000..49a2853
--- /dev/null
+++ b/pkgs/openssh/systemd/openssh.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=OpenSSH Server
+After=network.target
+
+[Service]
+ExecStartPre=/usr/lib/openssh/ssh-keygen
+ExecStart=/usr/sbin/sshd -D
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pkgs/systemd/patches/systemd-22-no-manpages.patch b/pkgs/systemd/patches/systemd-22-no-manpages.patch
deleted file mode 100644
index 10e267b..0000000
--- a/pkgs/systemd/patches/systemd-22-no-manpages.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -Nur old/Makefile.am new/Makefile.am
---- old/Makefile.am	2011-04-01 01:35:27.000000000 +0200
-+++ new/Makefile.am	2011-04-01 18:01:07.707885272 +0200
-@@ -519,71 +519,13 @@
- 	src/readahead-common.h \
- 	src/ask-password-api.h
- 
--MANPAGES = \
--	man/systemd.1 \
--	man/systemctl.1 \
--	man/systemadm.1 \
--	man/systemd-cgls.1 \
--	man/systemd-nspawn.1 \
--	man/systemd-tmpfiles.8 \
--	man/systemd-notify.1 \
--	man/sd_notify.3 \
--	man/sd_readahead.3 \
--	man/sd_booted.3 \
--	man/sd_listen_fds.3 \
--	man/sd_is_fifo.3 \
--	man/systemd.unit.5 \
--	man/systemd.service.5 \
--	man/systemd.socket.5 \
--	man/systemd.mount.5 \
--	man/systemd.automount.5 \
--	man/systemd.swap.5 \
--	man/systemd.timer.5 \
--	man/systemd.path.5 \
--	man/systemd.target.5 \
--	man/systemd.device.5 \
--	man/systemd.snapshot.5 \
--	man/systemd.exec.5 \
--	man/daemon.7 \
--	man/sd-daemon.7 \
--	man/sd-readahead.7 \
--	man/runlevel.8 \
--	man/telinit.8 \
--	man/halt.8 \
--	man/shutdown.8 \
--	man/pam_systemd.8 \
--	man/systemd.conf.5 \
--	man/tmpfiles.d.5 \
--	man/hostname.5 \
--	man/machine-id.5 \
--	man/vconsole.conf.5 \
--	man/locale.conf.5 \
--	man/os-release.5 \
--	man/modules-load.d.5
--
--MANPAGES_ALIAS = \
--	man/reboot.8 \
--	man/poweroff.8 \
--	man/sd_is_socket.3 \
--	man/sd_is_socket_unix.3 \
--	man/sd_is_socket_inet.3 \
--	man/sd_notifyf.3 \
--	man/init.1
--
--man/reboot.8: man/halt.8
--man/poweroff.8: man/halt.8
--man/sd_is_socket.3: man/sd_is_fifo.3
--man/sd_is_socket_unix.3: man/sd_is_fifo.3
--man/sd_is_socket_inet.3: man/sd_is_fifo.3
--man/sd_notifyf.3: man/sd_notify.3
--man/init.1: man/systemd.1
--
--dist_man_MANS = \
--	$(MANPAGES) \
--	$(MANPAGES_ALIAS)
-+MANPAGES =
- 
--nodist_man_MANS = \
--	man/systemd.special.7
-+MANPAGES_ALIAS =
-+
-+dist_man_MANS = 
-+
-+nodist_man_MANS =
- 
- XML_FILES = \
- 	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
diff --git a/pkgs/systemd/patches/systemd-24-no-manpages.patch b/pkgs/systemd/patches/systemd-24-no-manpages.patch
new file mode 100644
index 0000000..693a24e
--- /dev/null
+++ b/pkgs/systemd/patches/systemd-24-no-manpages.patch
@@ -0,0 +1,83 @@
+diff -Nur old/Makefile.am new/Makefile.am
+--- old/Makefile.am	2011-04-06 21:28:41.000000000 +0200
++++ new/Makefile.am	2011-04-08 19:45:31.779256001 +0200
+@@ -530,73 +530,13 @@
+ 	src/readahead-common.h \
+ 	src/ask-password-api.h
+ 
+-MANPAGES = \
+-	man/systemd.1 \
+-	man/systemctl.1 \
+-	man/systemadm.1 \
+-	man/systemd-cgls.1 \
+-	man/systemd-nspawn.1 \
+-	man/systemd-tmpfiles.8 \
+-	man/systemd-notify.1 \
+-	man/sd_notify.3 \
+-	man/sd_readahead.3 \
+-	man/sd_booted.3 \
+-	man/sd_listen_fds.3 \
+-	man/sd_is_fifo.3 \
+-	man/systemd.unit.5 \
+-	man/systemd.service.5 \
+-	man/systemd.socket.5 \
+-	man/systemd.mount.5 \
+-	man/systemd.automount.5 \
+-	man/systemd.swap.5 \
+-	man/systemd.timer.5 \
+-	man/systemd.path.5 \
+-	man/systemd.target.5 \
+-	man/systemd.device.5 \
+-	man/systemd.snapshot.5 \
+-	man/systemd.exec.5 \
+-	man/daemon.7 \
+-	man/sd-daemon.7 \
+-	man/sd-readahead.7 \
+-	man/runlevel.8 \
+-	man/telinit.8 \
+-	man/halt.8 \
+-	man/shutdown.8 \
+-	man/pam_systemd.8 \
+-	man/systemd.conf.5 \
+-	man/tmpfiles.d.5 \
+-	man/hostname.5 \
+-	man/machine-id.5 \
+-	man/vconsole.conf.5 \
+-	man/locale.conf.5 \
+-	man/os-release.5 \
+-	man/modules-load.d.5 \
+-	man/binfmt.d.5 \
+-	man/sysctl.d.5
+-
+-MANPAGES_ALIAS = \
+-	man/reboot.8 \
+-	man/poweroff.8 \
+-	man/sd_is_socket.3 \
+-	man/sd_is_socket_unix.3 \
+-	man/sd_is_socket_inet.3 \
+-	man/sd_notifyf.3 \
+-	man/init.1
+-
+-man/reboot.8: man/halt.8
+-man/poweroff.8: man/halt.8
+-man/sd_is_socket.3: man/sd_is_fifo.3
+-man/sd_is_socket_unix.3: man/sd_is_fifo.3
+-man/sd_is_socket_inet.3: man/sd_is_fifo.3
+-man/sd_notifyf.3: man/sd_notify.3
+-man/init.1: man/systemd.1
+-
+-dist_man_MANS = \
+-	$(MANPAGES) \
+-	$(MANPAGES_ALIAS)
++MANPAGES =
+ 
+-nodist_man_MANS = \
+-	man/systemd.special.7
++MANPAGES_ALIAS =
++
++dist_man_MANS =
++
++nodist_man_MANS =
+ 
+ XML_FILES = \
+ 	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
diff --git a/pkgs/systemd/systemd.nm b/pkgs/systemd/systemd.nm
index 4e8aad6..88c25f9 100644
--- a/pkgs/systemd/systemd.nm
+++ b/pkgs/systemd/systemd.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
PKG_NAME       = systemd
-PKG_VER        = 22
+PKG_VER        = 24
 PKG_REL        = 1
 PKG_CONFLICTS += upstart
@@ -68,15 +68,14 @@ CONFIGURE_OPTIONS += \
    --libexecdir=/usr/lib \
    --with-rootdir= \
    --with-distro=other \
-	--with-syslog-service=rsyslog.service \
    --with-sysvinit-path= \
    --with-sysvrcd-path= \
    --with-udevrulesdir=/lib/udev/rules.d/ \
    --with-pamlibdir=/etc/pam.d
-#define STAGE_PREPARE_CMDS
-#	cd $(DIR_APP) && ./autogen.sh ac
-#endef
+define STAGE_PREPARE_CMDS
+	cd $(DIR_APP) && ./autogen.sh ac
+endef
define STAGE_TEST
    cd $(DIR_APP) && make check
@@ -107,13 +106,13 @@ define STAGE_INSTALL_CMDS
    cd $(BUILDROOT)/lib/systemd/system && ln -svf multi-user.target default.target
# Replace absolute symlinks by relative ones.
-	cd $(BUILDROOT)/usr/share/systemd/user/ && ln -svf ../../../../lib/systemd/system/bluetooth.target bluetooth.target
-	cd $(BUILDROOT)/usr/share/systemd/user/ && ln -svf ../../../../lib/systemd/system/local-fs.target local-fs.target
-	cd $(BUILDROOT)/usr/share/systemd/user/ && ln -svf ../../../../lib/systemd/system/printer.target printer.target
-	cd $(BUILDROOT)/usr/share/systemd/user/ && ln -svf ../../../../lib/systemd/system/shutdown.target shutdown.target
-	cd $(BUILDROOT)/usr/share/systemd/user/ && ln -svf ../../../../lib/systemd/system/sockets.target sockets.target
-	cd $(BUILDROOT)/usr/share/systemd/user/ && ln -svf ../../../../lib/systemd/system/sound.target sound.target
-	cd $(BUILDROOT)/usr/share/systemd/user/ && ln -svf ../../../../lib/systemd/system/swap.target swap.target
+	cd $(BUILDROOT)/usr/lib/systemd/user/ && ln -svf ../../../../lib/systemd/system/bluetooth.target bluetooth.target
+	cd $(BUILDROOT)/usr/lib/systemd/user/ && ln -svf ../../../../lib/systemd/system/local-fs.target local-fs.target
+	cd $(BUILDROOT)/usr/lib/systemd/user/ && ln -svf ../../../../lib/systemd/system/printer.target printer.target
+	cd $(BUILDROOT)/usr/lib/systemd/user/ && ln -svf ../../../../lib/systemd/system/shutdown.target shutdown.target
+	cd $(BUILDROOT)/usr/lib/systemd/user/ && ln -svf ../../../../lib/systemd/system/sockets.target sockets.target
+	cd $(BUILDROOT)/usr/lib/systemd/user/ && ln -svf ../../../../lib/systemd/system/sound.target sound.target
+	cd $(BUILDROOT)/usr/lib/systemd/user/ && ln -svf ../../../../lib/systemd/system/swap.target swap.target
ln -svf ../../systemd/user $(BUILDROOT)/etc/xdg/systemd/user
 endef
hooks/post-receive
--
IPFire 3.x development tree

    