[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. fe61fe21519ea9300f6a36aca1c57f1aa70d5c38
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 fe61fe21519ea9300f6a36aca1c57f1aa70d5c38 (commit) via 60b906316e8134cd62fb85cba5a12cf89ee84286 (commit) via 2579ea3d89cc9ab6d5ab016a88c033a0e3018bbf (commit) via 8a0a0ff0d17600ab3bf2f7e18ca786d30dc6d55c (commit) via ff9b1021bbd08f18246bec71b72ca301221155e2 (commit) via 109fc27930e87da908001b911a468910ad10d6ba (commit) via a10bf432032c89e7230005a4ce5ec160b076abf2 (commit) via a5c18727bd95ef4eb6c92f8fc54cde0de7b0ee3b (commit) via 5549900422c0c84ae922c53149d9e90bb69bbd8f (commit) via de0bd2c52fa59c7bdd1ed72bfd421443f1894b45 (commit) via 1dcacb50dd2f6602c844e183f7bed735a260a9e8 (commit) via dde04de7fdf7f7d7102ba187a0825d034ad0caa2 (commit) via 9d13f279293c9563ae5f72ace56cd5d4a0f6a1cc (commit) via 118b251f33bdff7d1ac211a307029719546d2626 (commit) via 7a7a2f577d50d3b0dadea16728c13e6ec7d33adc (commit) via ffa2b2d627cc87a2d604ad44f699a58d4e877fdf (commit) via a8a6655dcf55033c6d75062d00a73c9a035376d5 (commit) via a6b862d36c13befb9467409f02b3b616e9198d46 (commit) via 4c0e6f3fcf6f4aab117a25f8473e1c6765258e9d (commit) via 9828c73b5f04c226e9ace610f63a7f3d1345b2e5 (commit) via bdedb1e2a13b1d1024f3c38f91bbb91436cc4440 (commit) via b448f5b6d1ebea208dffc363281599a533ff0281 (commit) via 65a52bd10d72e395a03eaf5038842dc03d493399 (commit) via 1d90e80480f17e0d59483a2e15dbc1ac8c9ba1f5 (commit) via 38907c6c30abf6fbc9a68385f788d6231f49d038 (commit) via 7a659ffac22277daaa2e84772485cf1f977dfb23 (commit) via 880f138f1a60145e29bd065a1351393770f39711 (commit) via fc9e3aec583e0edc67111fd48202b82a628bcd83 (commit) via df73f69fa26fac03125f1542ff33018f81ce8f6f (commit) via 26bf0839ee2b855fc155295678f657adab18c416 (commit) via 3599f94d2ee11e635459d30d078e3333aad0a5fa (commit) via 582b826926762047b7e308d2ee013bbc7b676e8d (commit) via db8e9861e87036c674794d54d8df2ff48f4bdfac (commit) via bf54d17a813b0f937f71b9652aeb4ef0e1ffd66d (commit) via 03c731562af673b69d5bb30d5df70326d6bda3eb (commit) via aaee4e3ac767dd200d1ac3d8022097ded4d407f4 (commit) via 687616f01de863ab4eb23608f8ac607a3ef174e8 (commit) via bf2edb0d409c550c1b029fb7b621fcfe8fe8980f (commit) via d8b11e8669f0d24c77d9f64ba9fb93e47465ff3f (commit) via a06bf3dc5ed4aaf17202fc75aea44da46a577621 (commit) via 24c9f05d835d0b1d0b0d820c0bdf94fb131d2e71 (commit) via 4cbe9d5d22ec3051468936ae54d030f787be8ec4 (commit) via 05d6cc82b26db50e41e34fe38817de48b9510c96 (commit) via e8a408fb0c656092f07a477a7f22d8a27987664f (commit) via 1f7ba1ceee7f6a45e6db458a8f14106bdd9fef50 (commit) via 6806cd1a92408166aeda9eab147d64c03782c4e9 (commit) via 9bb154f633c1027da71c9add11c78554e43f29e1 (commit) via c8ef6deffa60806ef77422f5f7512f6535613ea9 (commit) via 5d08a33fb8bf6056b430629d08dce1647c09042e (commit) via 779fac8b479ae5c0ed76e11d11b5e28a63b2a89e (commit) via b1e197cad6261aaa13e5c5138867e21f029708ed (commit) via 2646df70cd9c9445da03c70937c688c300629d35 (commit) via 58a880eeeed9dc747b4a3fe274a0c6e14c080a35 (commit) via cacabb62518f30c8d80dd9b2c591cd383c7385f6 (commit) via 274ff92165d809dede41e6ad78c2436170cf939c (commit) via 60149e079bc18b4dc8b6ccdcd9d36bd2b233718f (commit) via c5a595bf90ee3e076f2bd360f3d873c543930c9a (commit) from edba4df39c1a0770fcd618d6caccbe549fbfa0b2 (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 fe61fe21519ea9300f6a36aca1c57f1aa70d5c38 Merge: 60b9063 2579ea3 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Apr 4 12:17:35 2011 +0200
Merge remote-tracking branch 'stevee/systemd'
commit 60b906316e8134cd62fb85cba5a12cf89ee84286 Merge: edba4df 9828c73 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Apr 4 12:17:03 2011 +0200
Merge remote-tracking branch 'stevee/selinux'
Conflicts: pkgs/ed/ed.nm
commit 2579ea3d89cc9ab6d5ab016a88c033a0e3018bbf Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Apr 2 11:19:37 2011 +0200
openldap: Add systemd unit file.
References #153.
commit 8a0a0ff0d17600ab3bf2f7e18ca786d30dc6d55c Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Apr 2 10:19:26 2011 +0200
ulogd: Add systemd unit file.
References #153.
commit ff9b1021bbd08f18246bec71b72ca301221155e2 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Apr 2 10:08:13 2011 +0200
net-snmpd: Add systemd unit file.
References #153.
commit 109fc27930e87da908001b911a468910ad10d6ba Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Apr 2 09:34:56 2011 +0200
firewall: Add systemd unit file.
References #153.
commit a10bf432032c89e7230005a4ce5ec160b076abf2 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Apr 2 09:20:59 2011 +0200
vsftpd: Add systemd unit file.
References #153.
commit a5c18727bd95ef4eb6c92f8fc54cde0de7b0ee3b Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Apr 1 23:11:29 2011 +0200
netplug: Add systemd unit file.
References #153.
commit 5549900422c0c84ae922c53149d9e90bb69bbd8f Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Apr 1 22:56:51 2011 +0200
pdns-recursor: Add systemd unit file.
References #153.
commit de0bd2c52fa59c7bdd1ed72bfd421443f1894b45 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Apr 1 22:37:41 2011 +0200
radvd: Add systemd unit file.
References #153.
commit 1dcacb50dd2f6602c844e183f7bed735a260a9e8 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Apr 1 22:08:54 2011 +0200
lighttpd: Add systemd unit file.
Reference #153.
commit dde04de7fdf7f7d7102ba187a0825d034ad0caa2 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Apr 1 21:54:02 2011 +0200
cups: Add systemd unit file.
References #153.
commit 9d13f279293c9563ae5f72ace56cd5d4a0f6a1cc Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Apr 1 21:33:49 2011 +0200
freeradius: Add systemd unit file and tmpfile.
References #153.
commit 118b251f33bdff7d1ac211a307029719546d2626 Merge: 7a7a2f5 bf54d17 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Apr 1 20:23:31 2011 +0200
Merge remote-tracking branch 'ms/systemd' into systemd
commit 7a7a2f577d50d3b0dadea16728c13e6ec7d33adc Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Apr 1 19:29:06 2011 +0200
dracut: Update to 010.
Fixes #164.
commit ffa2b2d627cc87a2d604ad44f699a58d4e877fdf Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Apr 1 19:26:27 2011 +0200
udev: Update to 167.
Fixes #163.
commit a8a6655dcf55033c6d75062d00a73c9a035376d5 Merge: a6b862d 77a04db Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Apr 1 19:14:04 2011 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into systemd
commit a6b862d36c13befb9467409f02b3b616e9198d46 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Apr 1 18:15:17 2011 +0200
systemd: Update to 22.
References #162.
commit 4c0e6f3fcf6f4aab117a25f8473e1c6765258e9d Merge: 65a52bd 6036d8a Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Mar 29 20:36:20 2011 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into systemd
commit 9828c73b5f04c226e9ace610f63a7f3d1345b2e5 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Mar 28 23:45:13 2011 +0200
ed: Move STAGE_BUILD_CMDS to STAGE_INSTALL.
commit bdedb1e2a13b1d1024f3c38f91bbb91436cc4440 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Mar 28 22:51:07 2011 +0200
patch: Update to 2.6.1 add selinux support.
Fixes #85.
commit b448f5b6d1ebea208dffc363281599a533ff0281 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Mar 28 22:50:02 2011 +0200
ed: New package.
Fixes #159.
commit 65a52bd10d72e395a03eaf5038842dc03d493399 Merge: 1d90e80 16454cf Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Mar 28 21:59:12 2011 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into systemd
commit 1d90e80480f17e0d59483a2e15dbc1ac8c9ba1f5 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Mar 27 22:50:12 2011 +0200
lldpd: Load 8021q module at startup.
commit 38907c6c30abf6fbc9a68385f788d6231f49d038 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Mar 27 21:42:03 2011 +0200
logrotate: Add systemd unit file.
References #153.
commit 7a659ffac22277daaa2e84772485cf1f977dfb23 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Mar 27 20:56:22 2011 +0200
dbus: Remove job file for upstart.
dbus provides it's own shipped unit file for systemd.
References #153.
commit 880f138f1a60145e29bd065a1351393770f39711 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Mar 27 20:26:26 2011 +0200
systemd: Conflicts upstart.
References #149.
commit fc9e3aec583e0edc67111fd48202b82a628bcd83 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Mar 27 19:04:59 2011 +0200
ntp: Add systemd unit file.
References #153.
commit df73f69fa26fac03125f1542ff33018f81ce8f6f Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Mar 27 18:42:05 2011 +0200
systemd: Symlink binary to /sbin/init to use systemd as default init system.
References #149.
commit 26bf0839ee2b855fc155295678f657adab18c416 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Mar 27 18:40:39 2011 +0200
systemd: Remove runlevel targets.
Reference #149.
commit 3599f94d2ee11e635459d30d078e3333aad0a5fa Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 26 22:21:42 2011 +0100
lldpd: Add systemd unit an tmpfiles file.
Reference #149.
commit 582b826926762047b7e308d2ee013bbc7b676e8d Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 26 22:20:51 2011 +0100
lldpd: Update to 5.0.2.
commit db8e9861e87036c674794d54d8df2ff48f4bdfac Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 26 21:08:17 2011 +0100
network: Add systemd unit file.
Reference #149.
commit bf54d17a813b0f937f71b9652aeb4ef0e1ffd66d Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 26 21:00:45 2011 +0100
rstp: Add systemd unit file.
Dropping support for upstart.
References #149.
commit 03c731562af673b69d5bb30d5df70326d6bda3eb Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 26 20:57:07 2011 +0100
build-essentials: Add support for systemd unit files.
Dropping support for upstart.
References #149.
commit aaee4e3ac767dd200d1ac3d8022097ded4d407f4 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 26 19:16:32 2011 +0100
systemd: Change default target to multi-user.
commit 687616f01de863ab4eb23608f8ac607a3ef174e8 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 26 17:58:29 2011 +0100
systemd: Reenable support for selinux and audit.
commit bf2edb0d409c550c1b029fb7b621fcfe8fe8980f Merge: d8b11e8 4cbe9d5 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 26 17:55:10 2011 +0100
Merge branch 'systemd' of ssh://git.ipfire.org/pub/git/people/stevee/ipfire-3.x into systemd
commit d8b11e8669f0d24c77d9f64ba9fb93e47465ff3f Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 26 17:54:03 2011 +0100
dbus: Switch user from messagebus to dbus.
commit a06bf3dc5ed4aaf17202fc75aea44da46a577621 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 26 17:49:15 2011 +0100
systemd: Fix udevrulesdir.
Reference #149.
commit 24c9f05d835d0b1d0b0d820c0bdf94fb131d2e71 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 26 16:52:15 2011 +0100
dracut: Update to 008.
Fixes #151.
commit 4cbe9d5d22ec3051468936ae54d030f787be8ec4 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 26 16:52:15 2011 +0100
dracut: Update to 008.
Fixes #151.
commit 05d6cc82b26db50e41e34fe38817de48b9510c96 Merge: e8a408f 979444c Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 26 16:28:03 2011 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into systemd
commit e8a408fb0c656092f07a477a7f22d8a27987664f Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 26 14:23:02 2011 +0100
dbus: Update to 1.4.0.
Reference #149.
commit 1f7ba1ceee7f6a45e6db458a8f14106bdd9fef50 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 26 13:50:07 2011 +0100
udev: Update to 166.
Reference #149.
commit 6806cd1a92408166aeda9eab147d64c03782c4e9 Merge: 9bb154f b1839f5 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Mar 25 20:47:21 2011 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into systemd
commit 9bb154f633c1027da71c9add11c78554e43f29e1 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Mar 21 20:16:29 2011 +0100
systemd: Splitt package into base and units.
TODO: * boot and shutdown a working system * replace /sbin/init with systemd - still use working upstart as possible backup * remove upstart and only use systemd as init system.
Reference #149.
commit c8ef6deffa60806ef77422f5f7512f6535613ea9 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Mar 21 19:56:18 2011 +0100
systemd: New package.
Initial commit for systemd, TODO: * splitt package into base and units * boot and shutdown a working system * replace /sbin/init with systemd - still use working upstart as possible backup * remove upstart and only use systemd as init system.
Reference #149.
commit 5d08a33fb8bf6056b430629d08dce1647c09042e Merge: 779fac8 fb2f3a9 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Mar 21 19:56:03 2011 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into systemd
commit 779fac8b479ae5c0ed76e11d11b5e28a63b2a89e Merge: b1e197c 8adaa8e Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Mar 20 19:49:05 2011 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into systemd
commit b1e197cad6261aaa13e5c5138867e21f029708ed Merge: 2646df7 38fffe4 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Feb 6 18:48:28 2011 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into systemd
commit 2646df70cd9c9445da03c70937c688c300629d35 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Nov 19 14:13:51 2010 +0100
systemd: Update to v13.
commit 58a880eeeed9dc747b4a3fe274a0c6e14c080a35 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Nov 19 14:11:56 2010 +0100
systemd: Add workaround for build of manpages.
Created a patchfile to disable the build of manpages. They need a working docbook and naoki doesn't provide one atm.
commit cacabb62518f30c8d80dd9b2c591cd383c7385f6 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Nov 19 11:52:48 2010 +0100
systemd: Update to V12.
commit 274ff92165d809dede41e6ad78c2436170cf939c Author: Schantl Stefan Stevee@ipfire.org Date: Fri Nov 19 11:51:15 2010 +0100
libcgroup: New package.
commit 60149e079bc18b4dc8b6ccdcd9d36bd2b233718f Author: Schantl Stefan Stevee@ipfire.org Date: Fri Nov 19 11:50:42 2010 +0100
vala: New package.
commit c5a595bf90ee3e076f2bd360f3d873c543930c9a Author: Schantl Stefan Stevee@ipfire.org Date: Thu May 13 19:48:47 2010 +0200
systemd: New package.
-----------------------------------------------------------------------
Summary of changes: pkgs/build-essentials/build-essentials.nm | 2 +- pkgs/build-essentials/buildsystem/Constants | 5 +- pkgs/build-essentials/buildsystem/Functions | 12 +- .../libcgroup/libcgroup.nm} | 40 ++++--- pkgs/core/systemd/systemd-no-manpages.patch | 31 +++++ .../xcb-util.nm => core/systemd/systemd.nm} | 41 ++++--- pkgs/{libssh2/libssh2.nm => core/vala/vala.nm} | 30 +++--- pkgs/cups/cups.init | 9 -- pkgs/cups/cups.nm | 7 +- pkgs/cups/systemd/cups.service | 10 ++ pkgs/dbus/dbus.nm | 10 +- pkgs/dbus/messagebus.init | 15 --- pkgs/dracut/dracut.nm | 7 +- pkgs/ed/ed.nm | 2 +- pkgs/firewall/firewall-reload.init | 8 -- pkgs/firewall/firewall.init | 13 -- pkgs/firewall/firewall.nm | 2 +- pkgs/firewall/systemd/firewall.service | 13 ++ pkgs/freeradius/freeradius.init | 12 -- pkgs/freeradius/freeradius.nm | 6 + pkgs/freeradius/freeradius.tmpfile | 2 + pkgs/freeradius/systemd/freeradius.service | 12 ++ pkgs/lighttpd/lighttpd.init | 8 -- pkgs/lighttpd/lighttpd.nm | 2 +- pkgs/lighttpd/lighttpd.tmpfile | 1 + pkgs/lighttpd/systemd/lighttpd.service | 12 ++ pkgs/lldpd/lldpd.init | 8 -- pkgs/lldpd/lldpd.nm | 8 +- pkgs/lldpd/lldpd.tmpfiles | 1 + pkgs/lldpd/systemd/lldpd.service | 11 ++ pkgs/logrotate/logrotate.init | 4 - pkgs/logrotate/logrotate.nm | 2 +- pkgs/logrotate/systemd/logrotate.service | 5 + pkgs/net-snmp/net-snmp.nm | 2 +- pkgs/net-snmp/snmpd.init | 9 -- pkgs/net-snmp/systemd/snmpd.service | 9 ++ pkgs/netplug/netplug.nm | 2 +- pkgs/netplug/netplugd.init | 8 -- pkgs/netplug/systemd/netplug.service | 8 ++ pkgs/network/network-init.init | 8 -- pkgs/network/network.init | 13 -- pkgs/network/network.nm | 2 +- pkgs/network/systemd/network.service | 13 ++ pkgs/ntp/ntp.init | 8 -- pkgs/ntp/ntp.nm | 2 +- pkgs/ntp/systemd/ntp.service | 10 ++ pkgs/openldap/openldap.init | 10 -- pkgs/openldap/openldap.nm | 2 +- pkgs/openldap/systemd/openldap.service | 10 ++ pkgs/pdns-recursor/pdns-recursor.init | 9 -- pkgs/pdns-recursor/pdns-recursor.nm | 2 +- pkgs/pdns-recursor/systemd/pdns-recursor.service | 9 ++ pkgs/radvd/radvd.init | 9 -- pkgs/radvd/radvd.nm | 2 +- pkgs/radvd/radvd.tmpfile | 2 + pkgs/radvd/systemd/radvd.service | 9 ++ pkgs/rstp/rstp.init | 13 -- pkgs/rstp/rstp.nm | 2 +- pkgs/rstp/systemd/rstp.service | 11 ++ pkgs/systemd/patches/systemd-22-no-manpages.patch | 81 +++++++++++++ pkgs/systemd/systemd.nm | 119 ++++++++++++++++++++ pkgs/udev/udev.nm | 7 +- pkgs/ulogd2/systemd/ulogd.service | 9 ++ pkgs/ulogd2/ulogd.init | 8 -- pkgs/ulogd2/ulogd2.nm | 2 +- pkgs/vsftpd/systemd/vsftpd.service | 9 ++ pkgs/vsftpd/vsftpd.init | 9 -- pkgs/vsftpd/vsftpd.nm | 2 +- 68 files changed, 512 insertions(+), 269 deletions(-) copy pkgs/{libgpg-error/libgpg-error.nm => core/libcgroup/libcgroup.nm} (72%) create mode 100644 pkgs/core/systemd/systemd-no-manpages.patch copy pkgs/{xcb-util/xcb-util.nm => core/systemd/systemd.nm} (72%) copy pkgs/{libssh2/libssh2.nm => core/vala/vala.nm} (76%) delete mode 100644 pkgs/cups/cups.init create mode 100644 pkgs/cups/systemd/cups.service delete mode 100644 pkgs/dbus/messagebus.init delete mode 100644 pkgs/firewall/firewall-reload.init delete mode 100644 pkgs/firewall/firewall.init create mode 100644 pkgs/firewall/systemd/firewall.service delete mode 100644 pkgs/freeradius/freeradius.init create mode 100644 pkgs/freeradius/freeradius.tmpfile create mode 100644 pkgs/freeradius/systemd/freeradius.service delete mode 100644 pkgs/lighttpd/lighttpd.init create mode 100644 pkgs/lighttpd/lighttpd.tmpfile create mode 100644 pkgs/lighttpd/systemd/lighttpd.service delete mode 100644 pkgs/lldpd/lldpd.init create mode 100644 pkgs/lldpd/lldpd.tmpfiles create mode 100644 pkgs/lldpd/systemd/lldpd.service delete mode 100644 pkgs/logrotate/logrotate.init create mode 100644 pkgs/logrotate/systemd/logrotate.service delete mode 100644 pkgs/net-snmp/snmpd.init create mode 100644 pkgs/net-snmp/systemd/snmpd.service delete mode 100644 pkgs/netplug/netplugd.init create mode 100644 pkgs/netplug/systemd/netplug.service delete mode 100644 pkgs/network/network-init.init delete mode 100644 pkgs/network/network.init create mode 100644 pkgs/network/systemd/network.service delete mode 100644 pkgs/ntp/ntp.init create mode 100644 pkgs/ntp/systemd/ntp.service delete mode 100644 pkgs/openldap/openldap.init create mode 100644 pkgs/openldap/systemd/openldap.service delete mode 100644 pkgs/pdns-recursor/pdns-recursor.init create mode 100644 pkgs/pdns-recursor/systemd/pdns-recursor.service delete mode 100644 pkgs/radvd/radvd.init create mode 100644 pkgs/radvd/radvd.tmpfile create mode 100644 pkgs/radvd/systemd/radvd.service delete mode 100644 pkgs/rstp/rstp.init create mode 100644 pkgs/rstp/systemd/rstp.service create mode 100644 pkgs/systemd/patches/systemd-22-no-manpages.patch create mode 100644 pkgs/systemd/systemd.nm create mode 100644 pkgs/ulogd2/systemd/ulogd.service delete mode 100644 pkgs/ulogd2/ulogd.init create mode 100644 pkgs/vsftpd/systemd/vsftpd.service delete mode 100644 pkgs/vsftpd/vsftpd.init
Difference in files: diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm index 6509f73..5c89979 100644 --- a/pkgs/build-essentials/build-essentials.nm +++ b/pkgs/build-essentials/build-essentials.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = build-essentials PKG_VER = $(DISTRO_VERSION) -PKG_REL = 13 +PKG_REL = 14 PKG_EPOCH = 1 PKG_ARCH = noarch
diff --git a/pkgs/build-essentials/buildsystem/Constants b/pkgs/build-essentials/buildsystem/Constants index 0bc56c1..fde3c39 100644 --- a/pkgs/build-essentials/buildsystem/Constants +++ b/pkgs/build-essentials/buildsystem/Constants @@ -48,6 +48,8 @@ CONFIGURE_OPTIONS = \ --build=$(DISTRO_MACHINE) \ --prefix=/usr
+SYSTEMD_UNIT_DIR = /lib/systemd/system + ############################################################################### # # Packager variables @@ -140,10 +142,9 @@ DO_PATCHES = cd $(DIR_APP) && $(BUILD_TOOLS)/patch \ # Get a list of files that are installed automatically PKG_DEFAULT_FILES = $(wildcard $(DIR_SOURCE)/*.default) PKG_DEFAULT_FILES += $(wildcard $(DIR_SOURCE)/default/*) -PKG_INIT_FILES = $(wildcard $(DIR_SOURCE)/*.init) -PKG_INIT_FILES += $(wildcard $(DIR_SOURCE)/init/*.conf) PKG_PAM_FILES = $(wildcard $(DIR_SOURCE)/*.pam) PKG_PAM_FILES += $(wildcard $(DIR_SOURCE)/pam.d/*) +PKG_SYSTEMD_FILES += $(wildcard $(DIR_SOURCE)/systemd/*)
############################################################################### # diff --git a/pkgs/build-essentials/buildsystem/Functions b/pkgs/build-essentials/buildsystem/Functions index 53cceb6..b4a629c 100644 --- a/pkgs/build-essentials/buildsystem/Functions +++ b/pkgs/build-essentials/buildsystem/Functions @@ -59,14 +59,14 @@ define DO_INSTALL_DEFAULT $(foreach file,$(PKG_DEFAULT_FILES),$(call __INSTALL_DEFAULT,$(file))) endef
-define __INSTALL_INIT - -mkdir -pv $(BUILDROOT)/etc/init - cd $(DIR_APP) && cp -vf $(1) $(BUILDROOT)/etc/init/$(subst .init,.conf,$(notdir $(1))) +define __INSTALL_SYSTEMD + -mkdir -pv $(BUILDROOT)$(SYSTEMD_UNIT_DIR) + cd $(DIR_APP) && cp -vf $(1) $(BUILDROOT)$(SYSTEMD_UNIT_DIR)/$(notdir $(1))
endef
-define DO_INSTALL_INIT - $(foreach file,$(PKG_INIT_FILES),$(call __INSTALL_INIT,$(file))) +define DO_INSTALL_SYSTEMD + $(foreach file,$(PKG_SYSTEMD_FILES),$(call __INSTALL_SYSTEMD,$(file))) endef
define __INSTALL_PAM @@ -141,7 +141,7 @@ define DO_INSTALL $(STAGE_INSTALL)
$(DO_INSTALL_DEFAULT) - $(DO_INSTALL_INIT) + $(DO_INSTALL_SYSTEMD) $(DO_INSTALL_PAM)
@echo "#####################################################################" diff --git a/pkgs/core/libcgroup/libcgroup.nm b/pkgs/core/libcgroup/libcgroup.nm new file mode 100644 index 0000000..cc0f692 --- /dev/null +++ b/pkgs/core/libcgroup/libcgroup.nm @@ -0,0 +1,66 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = libcgroup +PKG_VER = 0.35.1 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Development/Libraries +PKG_URL = http://libcg.sourceforge.net/ +PKG_LICENSE = LGPLv2+ +PKG_SUMMARY = Tools and libraries to control and monitor control groups. + +PKG_PACKAGES += $(PKG_NAME_REAL)-devel + +PKG_BUILD_DEPS+= bison gcc-c++ flex + +define PKG_DESCRIPTION + Control groups infrastructure. The tools and library help manipulate, \ + control, administrate and monitor control groups and the associated \ + controllers. +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 + +CONFIGURE_OPTIONS += \ + --libdir=/lib \ + --disable-pam \ + --disable-tools \ + --disable-daemon + +#define STAGE_TEST +# cd $(DIR_APP) && make check +#endef + +define STAGE_INSTALL_CMDS + rm -rf $(BUILDROOT)/etc + + -mkdir -pv $(BUILDROOT)/usr/lib + rm -vf $(BUILDROOT)/lib/libcgroup.so + ln -svf ../../lib/libcgroup.so.1 $(BUILDROOT)/usr/lib/libcgroup.so +endef + diff --git a/pkgs/core/systemd/systemd-no-manpages.patch b/pkgs/core/systemd/systemd-no-manpages.patch new file mode 100644 index 0000000..a185fde --- /dev/null +++ b/pkgs/core/systemd/systemd-no-manpages.patch @@ -0,0 +1,31 @@ +diff -Nur a/Makefile b/Makefile +--- a/Makefile 2010-11-19 13:26:11.000000000 +0100 ++++ b/Makefile 2010-11-19 13:27:31.000000000 +0100 +@@ -525,11 +525,11 @@ + man/init.1: man/systemd.1 + + dist_man_MANS = \ +- $(MANPAGES) \ +- $(MANPAGES_ALIAS) ++# $(MANPAGES) \ ++# $(MANPAGES_ALIAS) + + nodist_man_MANS = \ +- man/systemd.special.7 ++# man/systemd.special.7 + + XML_FILES = \ + ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} +@@ -538,10 +538,10 @@ + ${patsubst %.1,%.xml.in,${patsubst %.3,%.xml.in,${patsubst %.5,%.xml.in,${patsubst %.7,%.xml.in,${patsubst %.8,%.xml.in,$(nodist_man_MANS)}}}}} + + dist_noinst_DATA = \ +- ${XML_FILES:.xml=.html} ++# ${XML_FILES:.xml=.html} + + nodist_noinst_DATA = \ +- ${XML_IN_FILES:.xml.in=.html} ++# ${XML_IN_FILES:.xml.in=.html} + + EXTRA_DIST += \ + $(XML_FILES) \ diff --git a/pkgs/core/systemd/systemd.nm b/pkgs/core/systemd/systemd.nm new file mode 100644 index 0000000..aa4c9c1 --- /dev/null +++ b/pkgs/core/systemd/systemd.nm @@ -0,0 +1,61 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = systemd +PKG_VER = 13 +PKG_REL = 0 + +PKG_MAINTAINER = Stefan Schantl stefan.schantl@ipfire.org +PKG_GROUP = System/Base +PKG_URL = http://www.freedesktop.org/wiki/Software/systemd +PKG_LICENSE = GPLv2+ +PKG_SUMMARY = systemd is a System and Session Manager. + +PKG_BUILD_DEPS+= autoconf automake dbus-devel dbus-glib-devel \ + libcap-devel libcgroup-devel libudev-devel libtool \ + pkg-config vala vala-devel + +define PKG_DESCRIPTION + systemd is a replacement of the old sysvinit and provides also \ + a Session Manager for it's started services. +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 + +define STAGE_PREPARE_CMDS + cd $(DIR_APP) && ./autogen.sh ac +endef + +define STAGE_CONFIGURE_CMDS + cd $(DIR_APP) && patch -Np1 -i $(DIR_SOURCE)/*.patch +endef + +CONFIGURE_OPTIONS += \ + --sbindir=/sbin \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --disable-gtk \ + --with-distro=other diff --git a/pkgs/core/vala/vala.nm b/pkgs/core/vala/vala.nm new file mode 100644 index 0000000..4bb903f --- /dev/null +++ b/pkgs/core/vala/vala.nm @@ -0,0 +1,54 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = vala +PKG_VER = 0.11.2 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Development/Languages +PKG_URL = http://live.gnome.org/Vala +PKG_LICENSE = LGPLv2+ and BSD +PKG_SUMMARY = A modern programming language. + +PKG_PACKAGES += $(PKG_NAME_REAL)-devel + +PKG_BUILD_DEPS+= bison dbus dbus-glib-devel flex pkg-config +PKG_DEPS += glib2 + +define PKG_DESCRIPTION + Vala is a new programming language that aims to bring modern \ + programming language features to GNOME developers without imposing \ + any additional runtime requirements and without using a different \ + ABI compared to applications and libraries written in C. +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 + +define STAGE_TEST + cd $(DIR_APP) && make check +endef + diff --git a/pkgs/cups/cups.init b/pkgs/cups/cups.init deleted file mode 100644 index 8dc9137..0000000 --- a/pkgs/cups/cups.init +++ /dev/null @@ -1,9 +0,0 @@ -description "Common Unix Printing System" -author "IPFire Team" - -start on started network -stop on kill-all-network-services or stopping network - -exec /usr/sbin/cupsd -c /etc/cups/cupsd.conf -expect daemon -respawn diff --git a/pkgs/cups/cups.nm b/pkgs/cups/cups.nm index fd30c1a..0261298 100644 --- a/pkgs/cups/cups.nm +++ b/pkgs/cups/cups.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = cups PKG_VER = 1.4.5 -PKG_REL = 3 +PKG_REL = 4
PKG_MAINTAINER = PKG_GROUPS = Applications/Printing @@ -78,3 +78,8 @@ define STAGE_INSTALL -mkdir -pv $(BUILDROOT)/etc/logrotate.d/ cp -vf $(DIR_SOURCE)/cups.logrotate $(BUILDROOT)/etc/logrotate.d/cups endef + +# This line has to be added at the installation of cups. +# File: /lib/udev/rules.d/99-systemd.rules +# Line: SUBSYSTEM=="usb", ATTR{serial}=="AL01077498", TAG+="systemd", ENV{SYSTEMD_WANTS}="cups.service" + diff --git a/pkgs/cups/systemd/cups.service b/pkgs/cups/systemd/cups.service new file mode 100644 index 0000000..ae668ab --- /dev/null +++ b/pkgs/cups/systemd/cups.service @@ -0,0 +1,10 @@ +[Unit] +Description=CUPS Printing Service + +[Service] +ExecStart=/usr/sbin/cupsd -f -c /etc/cups/cupsd.conf +ExecStartPost=/sbin/udevadm trigger --subsystem-match=usb --attr-match=serial=AL01077498 + +[Install] +WantedBy=multi-user.target + diff --git a/pkgs/dbus/dbus.nm b/pkgs/dbus/dbus.nm index 5aaab35..5c7437c 100644 --- a/pkgs/dbus/dbus.nm +++ b/pkgs/dbus/dbus.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include
PKG_NAME = dbus -PKG_VER = 1.3.2 -PKG_REL = 1 +PKG_VER = 1.4.0 +PKG_REL = 3
PKG_MAINTAINER = PKG_GROUPS = System/Daemons @@ -42,7 +42,7 @@ define PKG_DESCRIPTION per-user-login-session messaging facility. endef
-PKG_TARBALL = $(THISAPP).885483.tar.gz +PKG_TARBALL = $(THISAPP).tar.gz
PKG_PACKAGES += $(PKG_NAME)-devel $(PKG_NAME)-libs
@@ -54,7 +54,9 @@ CONFIGURE_OPTIONS += \ --libdir=/lib \ --libexecdir=/lib \ --enable-libaudit \ - --enable-selinux=yes + --enable-selinux=yes \ + --with-systemdsystemunitdir=/lib/systemd/system/ \ + --with-dbus-user=dbus
define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/usr/lib diff --git a/pkgs/dbus/messagebus.init b/pkgs/dbus/messagebus.init deleted file mode 100644 index 7c7404f..0000000 --- a/pkgs/dbus/messagebus.init +++ /dev/null @@ -1,15 +0,0 @@ -description "Starts the message bus daemon" -author "IPFire Team" - -start on stopped mountfs -stop on kill-all-services - -exec /usr/bin/dbus-daemon --config-file=/etc/dbus-1/system.conf --nofork -respawn - -pre-start script - dbus-uuidgen --ensure >/dev/null - if [ ! -d /var/run/dbus ]; then - mkdir /var/run/dbus - fi -end script diff --git a/pkgs/dracut/dracut.nm b/pkgs/dracut/dracut.nm index ed5dc08..c90c5aa 100644 --- a/pkgs/dracut/dracut.nm +++ b/pkgs/dracut/dracut.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include
PKG_NAME = dracut -PKG_VER = 007 -PKG_REL = 4 +PKG_VER = 010 +PKG_REL = 1 PKG_ARCH = noarch
PKG_MAINTAINER = @@ -46,9 +46,6 @@ endef PKG_TARBALL = $(THISAPP).tar.bz2
define STAGE_PREPARE_CMDS - # All check scripts must be executeable - cd $(DIR_APP) && chmod 0755 modules.d/*/check - # Remove all man pages. # XXX requires docbook cd $(DIR_APP) && sed -i Makefile \ diff --git a/pkgs/ed/ed.nm b/pkgs/ed/ed.nm index 73f1453..ca69588 100644 --- a/pkgs/ed/ed.nm +++ b/pkgs/ed/ed.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = ed PKG_VER = 1.5 -PKG_REL = 1 +PKG_REL = 3
PKG_MAINTAINER = PKG_GROUPS = Application/Text diff --git a/pkgs/firewall/firewall-reload.init b/pkgs/firewall/firewall-reload.init deleted file mode 100644 index 1f8c078..0000000 --- a/pkgs/firewall/firewall-reload.init +++ /dev/null @@ -1,8 +0,0 @@ -description "Reloads the firewall" -author "IPFire Team" - -start on firewall-reload and started firewall - -script - firewall restart -end script diff --git a/pkgs/firewall/firewall.init b/pkgs/firewall/firewall.init deleted file mode 100644 index 8c5d893..0000000 --- a/pkgs/firewall/firewall.init +++ /dev/null @@ -1,13 +0,0 @@ -description "Starts the firewall" -author "IPFire Team" - -start on starting network -stop on stopped network - -pre-start script - firewall start -end script - -post-stop script - firewall stop -end script diff --git a/pkgs/firewall/firewall.nm b/pkgs/firewall/firewall.nm index a3d8796..fd6bbdb 100644 --- a/pkgs/firewall/firewall.nm +++ b/pkgs/firewall/firewall.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = firewall PKG_VER = -PKG_REL = 1 +PKG_REL = 2
PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org PKG_GROUPS = Networking/Firewall diff --git a/pkgs/firewall/systemd/firewall.service b/pkgs/firewall/systemd/firewall.service new file mode 100644 index 0000000..bdce760 --- /dev/null +++ b/pkgs/firewall/systemd/firewall.service @@ -0,0 +1,13 @@ + +[Unit] +Description=Firewall +After=network.target + +[Service] +ExecStart=/usr/bin/firewall start +ExecStop=/usr/bin/firewall stop +ExecReload=/usr/bin/firewall restart + +[Install] +WantedBy=multi-user.target + diff --git a/pkgs/freeradius/freeradius.init b/pkgs/freeradius/freeradius.init deleted file mode 100644 index 9b41624..0000000 --- a/pkgs/freeradius/freeradius.init +++ /dev/null @@ -1,12 +0,0 @@ -description "Starts the free RADIUS server" -author "IPFire Team" - -start on started network -stop on kill-all-network-services or stopping network - -exec /usr/sbin/radiusd -f -respawn - -post-stop script - rm -vf /var/run/radiusd/radiusd.sock -end script diff --git a/pkgs/freeradius/freeradius.nm b/pkgs/freeradius/freeradius.nm index df89c43..81f3fd5 100644 --- a/pkgs/freeradius/freeradius.nm +++ b/pkgs/freeradius/freeradius.nm @@ -37,6 +37,9 @@ PKG_SUMMARY = High-performance and highly configurable free RADIUS server. PKG_BUILD_DEPS+= gdbm-devel libpcap-devel libtool libtool-devel openssl-devel \ perl
+# Freeradius requires make to generate it's certificates +PKG_DEPS += make + define PKG_DESCRIPTION The FreeRADIUS Server Project is a high performance and highly \ configurable GPL'd free RADIUS server. \ @@ -81,3 +84,6 @@ define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/etc/logrotate.d/ cp -vf $(DIR_SOURCE)/logrotate/freeradius $(BUILDROOT)/etc/logrotate.d/ endef + +# Generate certificates after installation +# Command: cd /etc/raddb/certs/ && make Makefile diff --git a/pkgs/freeradius/freeradius.tmpfile b/pkgs/freeradius/freeradius.tmpfile new file mode 100644 index 0000000..f06f7f3 --- /dev/null +++ b/pkgs/freeradius/freeradius.tmpfile @@ -0,0 +1,2 @@ +d /var/run/radiusd 0750 root root - + diff --git a/pkgs/freeradius/systemd/freeradius.service b/pkgs/freeradius/systemd/freeradius.service new file mode 100644 index 0000000..0bdae0d --- /dev/null +++ b/pkgs/freeradius/systemd/freeradius.service @@ -0,0 +1,12 @@ +[Unit] +Description=Freeradius Server +After=network.target + +[Service] +ExecStart=/usr/sbin/radiusd -f -d /etc/radvd/freeradius.conf +ExecReload=/bin/kill -HUP $MAINPID +ExecPostStop=/bin/rm -vf /var/run/radiusd/radiusd.sock + +[Install] +WantedBy=multi-user.target + diff --git a/pkgs/lighttpd/lighttpd.init b/pkgs/lighttpd/lighttpd.init deleted file mode 100644 index 801cec8..0000000 --- a/pkgs/lighttpd/lighttpd.init +++ /dev/null @@ -1,8 +0,0 @@ -description "Start lighttpd" -author "IPFire Team" - -start on started network -stop on kill-all-network-services or stopping network - -exec /usr/sbin/lighttpd -f /etc/lighttpd.conf -expect daemon diff --git a/pkgs/lighttpd/lighttpd.nm b/pkgs/lighttpd/lighttpd.nm index f1ae52f..fefdfd9 100644 --- a/pkgs/lighttpd/lighttpd.nm +++ b/pkgs/lighttpd/lighttpd.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = lighttpd PKG_VER = 1.4.28 -PKG_REL = 1 +PKG_REL = 2
PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org PKG_GROUPS = Networking/Webservers diff --git a/pkgs/lighttpd/lighttpd.tmpfile b/pkgs/lighttpd/lighttpd.tmpfile new file mode 100644 index 0000000..b1fdefd --- /dev/null +++ b/pkgs/lighttpd/lighttpd.tmpfile @@ -0,0 +1 @@ +d /var/run/lighttpd 0750 lighttpd lighttpd - diff --git a/pkgs/lighttpd/systemd/lighttpd.service b/pkgs/lighttpd/systemd/lighttpd.service new file mode 100644 index 0000000..04f343c --- /dev/null +++ b/pkgs/lighttpd/systemd/lighttpd.service @@ -0,0 +1,12 @@ + +[Unit] +Description=Lighttpd Daemon +After=network.target + +[Service] +ExecStartPre=/usr/sbin/lighttpd -t -f /etc/lighttpd.conf +ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/pkgs/lldpd/lldpd.init b/pkgs/lldpd/lldpd.init deleted file mode 100644 index 99774d6..0000000 --- a/pkgs/lldpd/lldpd.init +++ /dev/null @@ -1,8 +0,0 @@ -description "Starts the LLDP Daemon" -author "IPFire Team" - -start on started network -stop on kill-all-network-services or stopping network - -exec /usr/sbin/lldpd -c -respawn diff --git a/pkgs/lldpd/lldpd.nm b/pkgs/lldpd/lldpd.nm index 5aa2f15..68f91cb 100644 --- a/pkgs/lldpd/lldpd.nm +++ b/pkgs/lldpd/lldpd.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include
PKG_NAME = lldpd -PKG_VER = 0.5.0 -PKG_REL = 1 +PKG_VER = 0.5.2 +PKG_REL = 3
PKG_MAINTAINER = PKG_GROUPS = Networking/Tools @@ -44,4 +44,6 @@ endef PKG_TARBALL = $(THISAPP).tar.gz
CONFIGURE_OPTIONS += \ - --with-xml + --with-xml \ + --with-privsep-user=lldpd \ + --with-privsep-group=lldpd diff --git a/pkgs/lldpd/lldpd.tmpfiles b/pkgs/lldpd/lldpd.tmpfiles new file mode 100644 index 0000000..0e95b5a --- /dev/null +++ b/pkgs/lldpd/lldpd.tmpfiles @@ -0,0 +1 @@ +d /var/run/lldpd 0700 lldpd lldpd - diff --git a/pkgs/lldpd/systemd/lldpd.service b/pkgs/lldpd/systemd/lldpd.service new file mode 100644 index 0000000..1fa1215 --- /dev/null +++ b/pkgs/lldpd/systemd/lldpd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Link Layer Discovery Protocol Daemon +After=network.target + +[Service] +RemainAfterExit=yes +ExecPreStart=/sbin/modprobe 8021q +ExecStart=/usr/sbin/lldpd -c + +[Install] +WantedBy=multi-user.target diff --git a/pkgs/logrotate/logrotate.init b/pkgs/logrotate/logrotate.init deleted file mode 100644 index f09ba22..0000000 --- a/pkgs/logrotate/logrotate.init +++ /dev/null @@ -1,4 +0,0 @@ -description "Launches logrotate" -author "IPFire Team" - -exec logrotate /etc/logrotate.d/* diff --git a/pkgs/logrotate/logrotate.nm b/pkgs/logrotate/logrotate.nm index bebadef..0f1cf5a 100644 --- a/pkgs/logrotate/logrotate.nm +++ b/pkgs/logrotate/logrotate.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = logrotate PKG_VER = 3.7.7 -PKG_REL = 1 +PKG_REL = 2
PKG_MAINTAINER = PKG_GROUPS = Base System/Base diff --git a/pkgs/logrotate/systemd/logrotate.service b/pkgs/logrotate/systemd/logrotate.service new file mode 100644 index 0000000..0b45621 --- /dev/null +++ b/pkgs/logrotate/systemd/logrotate.service @@ -0,0 +1,5 @@ +[Unit] +Description=logrotate + +[Service] +ExexStart=/usr/sbin/logrotate /etc/logrotate.d/* diff --git a/pkgs/net-snmp/net-snmp.nm b/pkgs/net-snmp/net-snmp.nm index e9e8c86..803fc65 100644 --- a/pkgs/net-snmp/net-snmp.nm +++ b/pkgs/net-snmp/net-snmp.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = net-snmp PKG_VER = 5.4.2.1 -PKG_REL = 1 +PKG_REL = 2
PKG_MAINTAINER = PKG_GROUPS = Networking/Daemons diff --git a/pkgs/net-snmp/snmpd.init b/pkgs/net-snmp/snmpd.init deleted file mode 100644 index 2db0103..0000000 --- a/pkgs/net-snmp/snmpd.init +++ /dev/null @@ -1,9 +0,0 @@ -description "Starts the snmp Daemon" -author "IPFire Team" - -start on started network -stop on kill-all-network-services or stopping network - -exec /usr/sbin/snmpd -c /etc/snmpd.conf -expect daemon -respawn diff --git a/pkgs/net-snmp/systemd/snmpd.service b/pkgs/net-snmp/systemd/snmpd.service new file mode 100644 index 0000000..c6f032a --- /dev/null +++ b/pkgs/net-snmp/systemd/snmpd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Simple Network Management Protocol Daemon + +[Service] +Type=forking +ExecStart=/usr/sbin/snmpd -c /etc/snmpd.conf + +[Install] +WantedBy=multi-user.target diff --git a/pkgs/netplug/netplug.nm b/pkgs/netplug/netplug.nm index f5ccc7f..d57854d 100644 --- a/pkgs/netplug/netplug.nm +++ b/pkgs/netplug/netplug.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = netplug PKG_VER = 1.2.9.1 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUPS = Networking/Tools diff --git a/pkgs/netplug/netplugd.init b/pkgs/netplug/netplugd.init deleted file mode 100644 index 3f9fef4..0000000 --- a/pkgs/netplug/netplugd.init +++ /dev/null @@ -1,8 +0,0 @@ -description "Starts the netplug daemon" -author "IPFire Team" - -start on started network -stop on stopping network - -exec /sbin/netplugd -F -respawn diff --git a/pkgs/netplug/systemd/netplug.service b/pkgs/netplug/systemd/netplug.service new file mode 100644 index 0000000..ad3e6b5 --- /dev/null +++ b/pkgs/netplug/systemd/netplug.service @@ -0,0 +1,8 @@ +[Unit] +Description=netplug Daemon + +[Service] +ExecStart=/sbin/netplugd -F + +[Install] +WantedBy=multi-user.target diff --git a/pkgs/network/network-init.init b/pkgs/network/network-init.init deleted file mode 100644 index a44b96e..0000000 --- a/pkgs/network/network-init.init +++ /dev/null @@ -1,8 +0,0 @@ -description "Control the networking" -author "IPFire Team" - -start on stopped mountfs - -pre-start script - network init -end script diff --git a/pkgs/network/network.init b/pkgs/network/network.init deleted file mode 100644 index 9bb79e5..0000000 --- a/pkgs/network/network.init +++ /dev/null @@ -1,13 +0,0 @@ -description "Control the networking" -author "IPFire Team" - -start on started network-init -stop on shutdown-network - -pre-start script - network start -end script - -post-stop script - network stop -end script diff --git a/pkgs/network/network.nm b/pkgs/network/network.nm index 516cf1a..6fc792f 100644 --- a/pkgs/network/network.nm +++ b/pkgs/network/network.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = network PKG_VER = 0.99.0 -PKG_REL = 3 +PKG_REL = 4 PKG_ARCH = noarch
PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org diff --git a/pkgs/network/systemd/network.service b/pkgs/network/systemd/network.service new file mode 100644 index 0000000..0f65bcc --- /dev/null +++ b/pkgs/network/systemd/network.service @@ -0,0 +1,13 @@ +[Unit] +Description=Network Connectivity +Before=network.target + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecPreStart=/sbin/network init +ExecStart=/sbin/network start +ExecStop=/sbin/network stop + +[Install] +WantedBy=multi-user.target diff --git a/pkgs/ntp/ntp.init b/pkgs/ntp/ntp.init deleted file mode 100644 index b3193be..0000000 --- a/pkgs/ntp/ntp.init +++ /dev/null @@ -1,8 +0,0 @@ -description "Start system time daemon" -author "IPFire Team" - -start on started network -stop on kill-all-network-services or stopping network - -exec /usr/sbin/ntpd -4 -n -c /etc/ntp.conf -respawn diff --git a/pkgs/ntp/ntp.nm b/pkgs/ntp/ntp.nm index 1c7b20c..3fb3e92 100644 --- a/pkgs/ntp/ntp.nm +++ b/pkgs/ntp/ntp.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = ntp PKG_VER = 4.2.6p1 -PKG_REL = 1 +PKG_REL = 2
PKG_MAINTAINER = PKG_GROUPS = Base System/Daemons diff --git a/pkgs/ntp/systemd/ntp.service b/pkgs/ntp/systemd/ntp.service new file mode 100644 index 0000000..f2cc060 --- /dev/null +++ b/pkgs/ntp/systemd/ntp.service @@ -0,0 +1,10 @@ +[Unit] +Description=Network Time Protocol Daemon +After=network.target + +[Service] +ExecStart=/usr/sbin/ntpd -4 -n -c /etc/ntp.conf + +[Install] +WantedBy=multi-user.target + diff --git a/pkgs/openldap/openldap.init b/pkgs/openldap/openldap.init deleted file mode 100644 index 6091726..0000000 --- a/pkgs/openldap/openldap.init +++ /dev/null @@ -1,10 +0,0 @@ -description "Starts OpenLDAP slapd daemon" -author "IPFire Team" - -start on started mountfs -stop on kill-all-network-services - - -exec /usr/sbin/slapd -expect fork -respawn diff --git a/pkgs/openldap/openldap.nm b/pkgs/openldap/openldap.nm index 628f395..a62ce67 100644 --- a/pkgs/openldap/openldap.nm +++ b/pkgs/openldap/openldap.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = openldap PKG_VER = 2.4.21 -PKG_REL = 1 +PKG_REL = 2
PKG_MAINTAINER = PKG_GROUPS = System/Daemons diff --git a/pkgs/openldap/systemd/openldap.service b/pkgs/openldap/systemd/openldap.service new file mode 100644 index 0000000..4eb155f --- /dev/null +++ b/pkgs/openldap/systemd/openldap.service @@ -0,0 +1,10 @@ +[Unit] +Description=Very Secure FTP Daemon +After=basic.target + +[Service] +Type=forking +ExecStart=/usr/sbin/slapd + +[Install] +WantedBy=multi-user.target diff --git a/pkgs/pdns-recursor/pdns-recursor.init b/pkgs/pdns-recursor/pdns-recursor.init deleted file mode 100644 index c4ebfa6..0000000 --- a/pkgs/pdns-recursor/pdns-recursor.init +++ /dev/null @@ -1,9 +0,0 @@ -description "Control the powerdns recursor" -author "IPFire Team" - -start on starting network -stop on kill-all-network-services or stopping network - -exec /usr/sbin/pdns_recursor -expect fork -respawn diff --git a/pkgs/pdns-recursor/pdns-recursor.nm b/pkgs/pdns-recursor/pdns-recursor.nm index c82b7f0..9e4a995 100644 --- a/pkgs/pdns-recursor/pdns-recursor.nm +++ b/pkgs/pdns-recursor/pdns-recursor.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = pdns-recursor PKG_VER = 3.3 -PKG_REL = 1 +PKG_REL = 2
PKG_MAINTAINER = PKG_GROUPS = Networking/DNS diff --git a/pkgs/pdns-recursor/systemd/pdns-recursor.service b/pkgs/pdns-recursor/systemd/pdns-recursor.service new file mode 100644 index 0000000..b30521e --- /dev/null +++ b/pkgs/pdns-recursor/systemd/pdns-recursor.service @@ -0,0 +1,9 @@ +[Unit] +Description=Power DNS Recursor +After=network.target + +[Service] +ExecStart=/usr/sbin/pdns_recursor --daemon=no + +[Install] +WantedBy=multi-user.target diff --git a/pkgs/radvd/radvd.init b/pkgs/radvd/radvd.init deleted file mode 100644 index 546de6c..0000000 --- a/pkgs/radvd/radvd.init +++ /dev/null @@ -1,9 +0,0 @@ -description "Starts the radvd Daemon" -author "IPFire Team" - -start on started network -stop on kill-all-network-services or stopping network - -exec radvd -C /etc/radvd.conf -m stderr_syslog -p /var/run/radvd.pid -expect fork -respawn diff --git a/pkgs/radvd/radvd.nm b/pkgs/radvd/radvd.nm index 99334fb..3dab8a8 100644 --- a/pkgs/radvd/radvd.nm +++ b/pkgs/radvd/radvd.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = radvd PKG_VER = 1.5 -PKG_REL = 1 +PKG_REL = 2
PKG_MAINTAINER = PKG_GROUPS = System/Daemons diff --git a/pkgs/radvd/radvd.tmpfile b/pkgs/radvd/radvd.tmpfile new file mode 100644 index 0000000..8bab232 --- /dev/null +++ b/pkgs/radvd/radvd.tmpfile @@ -0,0 +1,2 @@ +d /var/run/radvd 0750 radvd radvd - + diff --git a/pkgs/radvd/systemd/radvd.service b/pkgs/radvd/systemd/radvd.service new file mode 100644 index 0000000..1006c75 --- /dev/null +++ b/pkgs/radvd/systemd/radvd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Router Advertisement Daemon +After=network.target + +[Service] +ExecStart=/usr/sbin/radvd -C /etc/radvd.conf -m stderr_syslog + +[Install] +WantedBy=multi-user.target diff --git a/pkgs/rstp/rstp.init b/pkgs/rstp/rstp.init deleted file mode 100644 index 5d968b0..0000000 --- a/pkgs/rstp/rstp.init +++ /dev/null @@ -1,13 +0,0 @@ -description "Rapid Spanning Tree Protocol Daemon" -author "IPFire Team" - -start on starting network -stop on stopped network - -pre-start script - modprobe net_pf_17 -end script - -exec /sbin/rstpd -expect fork -respawn diff --git a/pkgs/rstp/rstp.nm b/pkgs/rstp/rstp.nm index 8762a4a..3fbf6a3 100644 --- a/pkgs/rstp/rstp.nm +++ b/pkgs/rstp/rstp.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = rstp PKG_VER = 0.21 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUPS = Networking/Tools diff --git a/pkgs/rstp/systemd/rstp.service b/pkgs/rstp/systemd/rstp.service new file mode 100644 index 0000000..f501ad2 --- /dev/null +++ b/pkgs/rstp/systemd/rstp.service @@ -0,0 +1,11 @@ +[Unit] +Description=Rapid Spanning Tree Protocol Daemon +Before=network.service + +[Service] +RemainAfterExit=yes +ExecPreStart=/sbin/modprobe net_pf_17 +ExecStart=/sbin/rstpd -d + +[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 new file mode 100644 index 0000000..10e267b --- /dev/null +++ b/pkgs/systemd/patches/systemd-22-no-manpages.patch @@ -0,0 +1,81 @@ +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/systemd.nm b/pkgs/systemd/systemd.nm new file mode 100644 index 0000000..20345b5 --- /dev/null +++ b/pkgs/systemd/systemd.nm @@ -0,0 +1,119 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = systemd +PKG_VER = 22 +PKG_REL = 1 +PKG_CONFLICTS += upstart + +PKG_MAINTAINER = Stefan Schantl stefan.schantl@ipfire.org +PKG_GROUP = System/Base +PKG_URL = http://www.freedesktop.org/wiki/Software/systemd +PKG_LICENSE = GPLv2+ +PKG_SUMMARY = A System and Service Manager. + +PKG_BUILD_DEPS+= audit-devel automake autoconf cryptsetup-luks-devel dbus-devel \ + libcap-devel libselinux-devel libtool libudev-devel pam-devel + +define PKG_DESCRIPTION + systemd is a system and service manager for Linux, compatible with \ + SysV and LSB init scripts. +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 + +PKG_PACKAGES += $(PKG_NAME)-units $(PKG_NAME)-devel + +# Package information for systemd-units +PKG_SUMMARY-systemd-units = Configuration files, directories and installation tool for systemd. +PKG_DESCRIPTION-systemd-units = This package contains all needed configuration files, directories \ + and installation / configuration tool for systemd. + +define PKG_FILES-systemd-units + /etc/systemd/system + /etc/tmpfiles.d + /etc/bash_completion.d/systemctl-bash-completion.sh + /lib/systemd/system + /bin/systemctl + /bin/systemd-tmpfiles + /usr/share/man/man1/systemctl.* +endef + + +CONFIGURE_OPTIONS += \ + --sysconfdir=/etc \ + --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_TEST + cd $(DIR_APP) && make check +endef + +define STAGE_INSTALL_CMDS + # Create sysv compatible symlinks. + -mkdir -pv $(BUILDROOT)/sbin + ln -svf ../bin/systemd $(BUILDROOT)/sbin/init + ln -svf ../bin/systemctl $(BUILDROOT)/sbin/reboot + ln -svf ../bin/systemctl $(BUILDROOT)/sbin/halt + ln -svf ../bin/systemctl $(BUILDROOT)/sbin/poweroff + ln -svf ../bin/systemctl $(BUILDROOT)/sbin/shutdown + + # Create empty machine-id file. + touch $(BUILDROOT)/etc/machine-id + + rm -rfv $(BUILDROOT)/etc/systemd/system/*.target.wants + -mkdir -pv $(BUILDROOT)/lib/systemd/system/basic.target.wants + -mkdir -pv $(BUILDROOT)/lib/systemd/system/default.target.wants + -mkdir -pv $(BUILDROOT)/lib/systemd/system/dbus.target.wants + -mkdir -pv $(BUILDROOT)/lib/systemd/system/syslog.target.wants + + # Remove runlevel targets + rm -rfv $(BUILDROOT)/lib/systemd/system/runlevel* + + # Set default target to multi-user + 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 + + ln -svf ../../systemd/user $(BUILDROOT)/etc/xdg/systemd/user +endef diff --git a/pkgs/udev/udev.nm b/pkgs/udev/udev.nm index 2985a2a..a4f0e39 100644 --- a/pkgs/udev/udev.nm +++ b/pkgs/udev/udev.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include
PKG_NAME = udev -PKG_VER = 160 -PKG_REL = 2 +PKG_VER = 167 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUPS = Base System/Base @@ -54,7 +54,8 @@ CONFIGURE_OPTIONS += \ --libexecdir=/lib/udev \ --with-rootlibdir=/lib \ --with-selinux \ - --disable-introspection + --disable-introspection \ + --with-systemdsystemunitdir=/lib/systemd/system
define STAGE_INSTALL_CMDS # Install rules diff --git a/pkgs/ulogd2/systemd/ulogd.service b/pkgs/ulogd2/systemd/ulogd.service new file mode 100644 index 0000000..acd9e46 --- /dev/null +++ b/pkgs/ulogd2/systemd/ulogd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Userspace Logging Daemon +After=firewall.service + +[Service] +ExecStart=/usr/sbin/ulogd -c /etc/ulogd.conf + +[Install] +WantedBy=multi-user.target diff --git a/pkgs/ulogd2/ulogd.init b/pkgs/ulogd2/ulogd.init deleted file mode 100644 index 186daa8..0000000 --- a/pkgs/ulogd2/ulogd.init +++ /dev/null @@ -1,8 +0,0 @@ -description "A userspace logging daemon" -author "IPFire Team" - -start on started firewall -stop on kill-all-services or stopping firewall - -exec /usr/sbin/ulogd -c /etc/ulogd.conf -respawn diff --git a/pkgs/ulogd2/ulogd2.nm b/pkgs/ulogd2/ulogd2.nm index 89d381a..9531f34 100644 --- a/pkgs/ulogd2/ulogd2.nm +++ b/pkgs/ulogd2/ulogd2.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = ulogd PKG_VER = 2.0.0beta3 -PKG_REL = 1 +PKG_REL = 2
PKG_MAINTAINER = PKG_GROUPS = Networking/Statistics diff --git a/pkgs/vsftpd/systemd/vsftpd.service b/pkgs/vsftpd/systemd/vsftpd.service new file mode 100644 index 0000000..4d1148f --- /dev/null +++ b/pkgs/vsftpd/systemd/vsftpd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Very Secure FTP Daemon + +[Service] +Type=forking +ExecStart=/usr/bin/vsftpd /etc/vsftpd/vsftpd.conf + +[Install] +WantedBy=multi-user.target diff --git a/pkgs/vsftpd/vsftpd.init b/pkgs/vsftpd/vsftpd.init deleted file mode 100644 index ac8b02f..0000000 --- a/pkgs/vsftpd/vsftpd.init +++ /dev/null @@ -1,9 +0,0 @@ -description "Very secure FTP daemon" -author "IPFire Team" - -start on started network -stop on kill-all-network-services or stopping network - -exec /usr/bin/vsftpd /etc/vsftpd/vsftpd.conf -obackground=NO -expect daemon -respawn diff --git a/pkgs/vsftpd/vsftpd.nm b/pkgs/vsftpd/vsftpd.nm index a08613c..c93c836 100644 --- a/pkgs/vsftpd/vsftpd.nm +++ b/pkgs/vsftpd/vsftpd.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = vsftpd PKG_VER = 2.3.4 -PKG_REL = 2 +PKG_REL = 3
PKG_MAINTAINER = PKG_GROUPS = Networking/Daemons
hooks/post-receive -- IPFire 3.x development tree
-
git＠ipfire.org