diff options
Diffstat (limited to 'core')
31 files changed, 412 insertions, 68 deletions
diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD index 795884823..65386def0 100644 --- a/core/cronie/PKGBUILD +++ b/core/cronie/PKGBUILD @@ -3,7 +3,7 @@ pkgname='cronie' pkgver=1.4.8 -pkgrel=1 +pkgrel=2 pkgdesc='Daemon that runs specified programs at scheduled times and related tools' url='https://fedorahosted.org/cronie/' license=('custom:BSD') @@ -13,10 +13,12 @@ optdepends=('smtp-server: sending cron job output via email') source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'cron.deny' + 'service' 'pam.d' 'rc.d') sha1sums=('1d2ce3a6ca2a6f96ff31921e4060be3199dc10f3' '0f279b8fb820340267d578dc85511c980715f91e' + '3038a05476829f72fc4918bee9176b273ce10340' '5eff7fb31f6bc0a924243ff046704726cf20c221' 'c08c040ed5cb12bc4fd15639a5242d31ec247ef5') @@ -48,17 +50,19 @@ package() { make DESTDIR="${pkgdir}" install - install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly} - install -d "${pkgdir}"/var/spool/{ana,}cron chmod u+s "${pkgdir}"/usr/bin/crontab + install -d "${pkgdir}"/var/spool/{ana,}cron + install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly} install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/crond install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny + install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/cronie.service + install -Dm644 crond.sysconfig "${pkgdir}"/etc/conf.d/crond + install -Dm644 contrib/anacrontab "${pkgdir}"/etc/anacrontab install -Dm644 contrib/0hourly "${pkgdir}"/etc/cron.d/0hourly install -Dm755 contrib/0anacron "${pkgdir}"/etc/cron.hourly/0anacron - install -Dm644 contrib/anacrontab "${pkgdir}"/etc/anacrontab install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/cronie/COPYING } diff --git a/core/cronie/service b/core/cronie/service new file mode 100644 index 000000000..5ae193bfc --- /dev/null +++ b/core/cronie/service @@ -0,0 +1,10 @@ +[Unit] +Description=Periodic Command Scheduler + +[Service] +ExecStart=/usr/sbin/crond -n +ExecReload=/bin/kill -HUP $MAINPID +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/core/dmraid/PKGBUILD b/core/dmraid/PKGBUILD index e3496143f..39f3672be 100644 --- a/core/dmraid/PKGBUILD +++ b/core/dmraid/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160390 2012-06-01 13:21:33Z dreisner $ +# $Id: PKGBUILD 162150 2012-06-22 12:53:50Z dreisner $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> #Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=dmraid pkgver=1.0.0.rc16.3 -pkgrel=5 +pkgrel=7 pkgdesc="Device mapper RAID interface" url="http://people.redhat.com/~heinzm/sw/dmraid/" conflicts=('mkinitcpio<0.7') @@ -14,11 +14,15 @@ license=('GPL') source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2 http://people.redhat.com/~heinzm/sw/dmraid/src/$pkgname-1.0.0.rc16-3.tar.bz2 dmraid_install - dmraid_hook) + dmraid_hook + dmraid_tmpfiles + dmraid.service) install=dmraid.install md5sums=('819338fcef98e8e25819f0516722beeb' '2297d23cee1aef23ec6ad8d6d1870356' - 'faec669dc85f87187b45b5d3968efe2c') + 'faec669dc85f87187b45b5d3968efe2c' + '56a8bb0ece8d206cd8efb504ee072ddd' + 'de0af1fdb9ed4c109b8119160167d2e9') build() { cd "$pkgname/1.0.0.rc16-3/$pkgname" @@ -29,11 +33,12 @@ build() { package() { cd "$pkgname/1.0.0.rc16-3/$pkgname" make DESTDIR="$pkgdir" prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install - mkdir -p "$pkgdir"/var/lock/dmraid - chmod 1777 "$pkgdir"/var/lock/ install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/usr/lib/initcpio/install/dmraid install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/usr/lib/initcpio/hooks/dmraid + install -D -m644 "$srcdir"/dmraid_tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/dmraid.conf + # fix permissions - chmod 644 "$pkgdir"/usr/lib/libdmraid.a - chmod 644 "$pkgdir"/usr/include/dmraid/* + chmod 644 "$pkgdir"/usr/include/dmraid/* "$pkgdir"/usr/lib/libdmraid.a + + install -Dm644 "$srcdir/dmraid.service" "$pkgdir/usr/lib/systemd/system/dmraid.service" } diff --git a/core/dmraid/dmraid.service b/core/dmraid/dmraid.service new file mode 100644 index 000000000..1fd142ff2 --- /dev/null +++ b/core/dmraid/dmraid.service @@ -0,0 +1,16 @@ +[Unit] +Description=Assemble FakeRAID arrays +DefaultDependencies=no +Requires=systemd-udev-settle.service +After=systemd-udev-settle.service +Before=basic.target shutdown.target +Conflicts=shutdown.target + +[Service] +ExecStart=/sbin/dmraid --ignorelocking --activate y -Z +Type=oneshot +TimeoutSec=0 +RemainAfterExit=true + +[Install] +WantedBy=basic.target diff --git a/core/dmraid/dmraid_tmpfiles b/core/dmraid/dmraid_tmpfiles new file mode 100644 index 000000000..4f21ac1fc --- /dev/null +++ b/core/dmraid/dmraid_tmpfiles @@ -0,0 +1 @@ +d /run/lock/dmraid 1777 root root diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index d9b1c4a78..50338486d 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161348 2012-06-10 05:52:29Z allan $ +# $Id: PKGBUILD 162151 2012-06-22 12:55:07Z dreisner $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.15 -pkgrel=11 +pkgrel=12 _glibcdate=20111227 pkgdesc="GNU C Library" arch=('i686' 'x86_64') @@ -50,7 +50,9 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t glibc-2.15-nearbyintf-rounding.patch glibc-2.15-confstr-local-buffer-extent.patch glibc-2.15-testsuite.patch - nscd + nscd.rcd + nscd.service + nscd.tmpfiles locale.gen.txt locale-gen) md5sums=('6ffdf5832192b92f98bdd125317c0dfc' @@ -83,10 +85,13 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '7ff501435078b1a2622124fbeaafc921' '8d1023a51e0932681b46440d5f8551ee' '6962c3fa29306bfbf6f0d22b19cb825d' - 'b587ee3a70c9b3713099295609afde49' + '589d79041aa767a5179eaa4e2737dd3f' + 'ad8a9af15ab7eeaa23dc7ee85024af9f' + 'bccbe5619e75cf1d97312ec3681c605c' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') + mksource() { git clone git://sourceware.org/git/glibc.git pushd glibc @@ -269,15 +274,17 @@ package() { rm -f ${pkgdir}/etc/ld.so.{cache,conf} - install -dm755 ${pkgdir}/etc/rc.d - install -dm755 ${pkgdir}/usr/sbin - install -dm755 ${pkgdir}/usr/lib/locale + install -dm755 ${pkgdir}/{etc/rc.d,usr/{sbin,lib/{,locale,systemd/system,tmpfiles.d}}} + install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf - install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd - install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin + sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf + install -m755 ${srcdir}/nscd.rcd ${pkgdir}/etc/rc.d/nscd + install -m644 ${srcdir}/nscd.service ${pkgdir}/usr/lib/systemd/system + install -m644 ${srcdir}/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf + install -m644 ${srcdir}/glibc/posix/gai.conf ${pkgdir}/etc/gai.conf - sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf + install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin # create /etc/locale.gen install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen diff --git a/core/glibc/nscd.rcd b/core/glibc/nscd.rcd new file mode 100755 index 000000000..4b48ab002 --- /dev/null +++ b/core/glibc/nscd.rcd @@ -0,0 +1,65 @@ +#!/bin/bash + +daemon_name="nscd" + +. /etc/rc.conf +. /etc/rc.d/functions + + +get_pid() { + pidof -o %PPID $daemon_name +} + +case "$1" in + start) + stat_busy "Starting $daemon_name daemon" + PID=$(get_pid) + if [[ -z $PID ]]; then + rm -f /run/$daemon_name.pid + mkdir -p /run/nscd /var/db/nscd + rm -f /run/nscd/* /var/db/nscd/* + $daemon_name + if (( $? > 0 )); then + stat_fail + exit 1 + else + echo $(get_pid) > /var/run/$daemon_name.pid + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + [[ -n $PID ]] && nscd --shutdown &> /dev/null + if (( $? > 0 )); then + stat_fail + exit 1 + else + rm -f /run/$daemon_name.pid &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" +esac + +exit 0 diff --git a/core/glibc/nscd.service b/core/glibc/nscd.service new file mode 100644 index 000000000..de5315e9b --- /dev/null +++ b/core/glibc/nscd.service @@ -0,0 +1,17 @@ +[Unit] +Description=Name Service Cache Daemon +After=syslog.target + +[Service] +Type=forking +ExecStart=/usr/sbin/nscd +ExecStop=/usr/sbin/nscd --shutdown +ExecReload=/usr/sbin/nscd -i passwd +ExecReload=/usr/sbin/nscd -i group +ExecReload=/usr/sbin/nscd -i hosts +ExecReload=/usr/sbin/nscd -i service +Restart=always +PIDFile=/run/nscd/nscd.pid + +[Install] +WantedBy=multi-user.target diff --git a/core/glibc/nscd.tmpfiles b/core/glibc/nscd.tmpfiles new file mode 100644 index 000000000..8a24a785e --- /dev/null +++ b/core/glibc/nscd.tmpfiles @@ -0,0 +1 @@ +d /run/nscd 0755 root root diff --git a/core/iptables/0503-extension_cppflags.patch b/core/iptables/0503-extension_cppflags.patch new file mode 100644 index 000000000..0eb645731 --- /dev/null +++ b/core/iptables/0503-extension_cppflags.patch @@ -0,0 +1,13 @@ +Index: b/extensions/GNUmakefile.in +=================================================================== +--- a/extensions/GNUmakefile.in 2012-03-27 12:14:05.000000000 -0400 ++++ b/extensions/GNUmakefile.in 2012-03-27 16:03:48.378790221 -0400 +@@ -21,7 +21,7 @@ + kinclude_CPPFLAGS = @kinclude_CPPFLAGS@ + + AM_CFLAGS = ${regular_CFLAGS} +-AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ++AM_CPPFLAGS = ${CPPFLAGS} ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} + AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@ + AM_LDFLAGS = @noundef_LDFLAGS@ + diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index 42d5e009e..d2c859de4 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156635 2012-04-21 23:34:43Z allan $ +# $Id: PKGBUILD 162152 2012-06-22 12:55:41Z dreisner $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.13 -pkgrel=1 +pkgver=1.4.14 +pkgrel=2 pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64') license=('GPL2') @@ -22,9 +22,13 @@ source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.ta empty-mangle.rules empty-nat.rules empty-raw.rules - empty-security.rules) + empty-security.rules + 0503-extension_cppflags.patch + iptables.service + ip6tables.service + iptables-flush) backup=(etc/conf.d/iptables) -sha1sums=('bf1f1896e052d1813a7c96fa70f88be8dab3ff86' +sha1sums=('daf2972b81e52f562a644798013e946c88319ea3' '5bb6fa526665cdd728c26f0f282f5a51f220cf88' '2db68906b603e5268736f48c8e251f3a49da1d75' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' @@ -34,25 +38,25 @@ sha1sums=('bf1f1896e052d1813a7c96fa70f88be8dab3ff86' 'c45b738b5ec4cfb11611b984c21a83b91a2d58f3' '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6' '7db53bb882f62f6c677cc8559cff83d8bae2ef73' - 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e') + 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e' + '44626980a52e49f345a0b1e1ca03060f3a35763c' + '5c4eb4ea88c302e8ff98f435a11dd59b00f4d8b9' + 'f1f16f44c6a5547b6f251d13007fe6585761e8b0' + 'e7abda09c61142121b6695928d3b71ccd8fdf73a') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # http://bugs.archlinux.org/task/17046 - sed -i '87 i libxt_RATEEST.so: libxt_RATEEST.oo' extensions/GNUmakefile.in - sed -i '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' extensions/GNUmakefile.in - # use system one rm include/linux/types.h + patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch + ./configure --prefix=/usr \ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ --with-xtlibdir=/usr/lib/iptables \ --enable-devel --enable-libipq \ - --enable-shared --enable-static -# build fails when not enabling static, see if we can remove it on next build -# 1.4.13 still fails + --enable-shared make } @@ -71,4 +75,10 @@ package() { mkdir -p "${pkgdir}"/var/lib/iptables install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/iptables + + # install systemd files + install -Dm644 ${srcdir}/iptables.service ${pkgdir}/usr/lib/systemd/system/iptables.service + install -Dm644 ${srcdir}/ip6tables.service ${pkgdir}/usr/lib/systemd/system/ip6tables.service + install -Dm755 ${srcdir}/iptables-flush ${pkgdir}/usr/lib/systemd/scripts/iptables-flush } + diff --git a/core/iptables/ip6tables.service b/core/iptables/ip6tables.service new file mode 100644 index 000000000..9a695f31e --- /dev/null +++ b/core/iptables/ip6tables.service @@ -0,0 +1,11 @@ +[Unit] +Description=IPv6 Packet Filtering Framework + +[Service] +Type=oneshot +ExecStart=/usr/sbin/ip6tables-restore /etc/iptables/ip6tables.rules +ExecStop=/usr/lib/systemd/scripts/iptables-flush 6 +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/core/iptables/iptables-flush b/core/iptables/iptables-flush new file mode 100755 index 000000000..e6fafe950 --- /dev/null +++ b/core/iptables/iptables-flush @@ -0,0 +1,18 @@ +#!/bin/bash +# +# Usage: iptables-flush [6] +# + +iptables=ip$1tables +if ! type -p "$iptables"; then + echo "error: invalid argument" + exit 1 +fi + +while read -r table; do + tables+=("/var/lib/$iptables/empty-$table.rules") +done <"/proc/net/ip$1_tables_names" + +if (( ${#tables[*]} )); then + cat "${tables[@]}" | "$iptables-restore" +fi diff --git a/core/iptables/iptables.service b/core/iptables/iptables.service new file mode 100644 index 000000000..3084f53b7 --- /dev/null +++ b/core/iptables/iptables.service @@ -0,0 +1,11 @@ +[Unit] +Description=Packet Filtering Framework + +[Service] +Type=oneshot +ExecStart=/usr/sbin/iptables-restore /etc/iptables/iptables.rules +ExecStop=/usr/lib/systemd/scripts/iptables-flush +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index 0521b887a..7452e062d 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160944 2012-06-07 11:57:54Z stephane $ +# $Id: PKGBUILD 162178 2012-06-22 17:24:25Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 pkgver=1.10.2 -pkgrel=1 +pkgrel=2 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64') url="http://web.mit.edu/kerberos/" @@ -14,13 +14,23 @@ backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-signed.tar krb5-1.10.1-gcc47.patch krb5-kadmind + krb5-kadmind.service krb5-kdc - krb5-kpropd) + krb5-kdc.service + krb5-kpropd + krb5-kpropd.service + krb5-kpropd@.service + krb5-kpropd.socket) sha1sums=('8b6e2c5bf0c65aacd368b3698add7888f2a7332d' '78b759d566b1fdefd9bbcd06df14f07f12effe96' '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' + 'a2a01e7077d9e89cda3457ea0e216debb3dc353c' '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' - '7f402078fa65bb9ff1beb6cbbbb017450df78560') + 'f5e4fa073e11b0fcb4e3098a5d58a4f791ec841e' + '7f402078fa65bb9ff1beb6cbbbb017450df78560' + '614401dd4ac18e310153240bb26eb32ff1e8cf5b' + '023a8164f8ee7066ac814486a68bc605e79f6101' + 'f3677d30dbbd7106c581379c2c6ebb1bf7738912') options=('!emptydirs') build() { @@ -74,4 +84,9 @@ package() { install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + + # systemd stuff + install -dm 755 "${pkgdir}"/usr/lib/systemd/system + install -m 644 ../../krb5-{kadmind.service,kdc.service,kpropd.service,kpropd@.service,kpropd.socket} \ + "${pkgdir}"/usr/lib/systemd/system } diff --git a/core/krb5/krb5-kadmind.service b/core/krb5/krb5-kadmind.service new file mode 100644 index 000000000..f3836c898 --- /dev/null +++ b/core/krb5/krb5-kadmind.service @@ -0,0 +1,8 @@ +[Unit] +Description=Kerberos 5 administration server + +[Service] +ExecStart=/usr/sbin/kadmind -nofork + +[Install] +WantedBy=multi-user.target diff --git a/core/krb5/krb5-kdc.service b/core/krb5/krb5-kdc.service new file mode 100644 index 000000000..6ec93bb72 --- /dev/null +++ b/core/krb5/krb5-kdc.service @@ -0,0 +1,9 @@ +[Unit] +Description=Kerberos 5 KDC + +[Service] +ExecStart=/usr/sbin/krb5kdc -n +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/core/krb5/krb5-kpropd.service b/core/krb5/krb5-kpropd.service new file mode 100644 index 000000000..a7c5b579d --- /dev/null +++ b/core/krb5/krb5-kpropd.service @@ -0,0 +1,8 @@ +[Unit] +Description=Kerberos 5 propagation server + +[Service] +ExecStart=/usr/sbin/kpropd -S + +[Install] +WantedBy=multi-user.target diff --git a/core/krb5/krb5-kpropd.socket b/core/krb5/krb5-kpropd.socket new file mode 100644 index 000000000..4389290c0 --- /dev/null +++ b/core/krb5/krb5-kpropd.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Kerberos 5 propagation server + +[Socket] +ListenStream=754 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/core/krb5/krb5-kpropd@.service b/core/krb5/krb5-kpropd@.service new file mode 100644 index 000000000..46f7e3639 --- /dev/null +++ b/core/krb5/krb5-kpropd@.service @@ -0,0 +1,8 @@ +[Unit] +Description=Kerberos 5 propagation server +Conflicts=krb5-kpropd.service + +[Service] +ExecStart=/usr/sbin/kpropd +StandardInput=socket +StandardError=syslog diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index 9cbb8bcf3..ed0587484 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 160347 2012-06-01 12:56:44Z dreisner $ +# $Id: PKGBUILD 162154 2012-06-22 12:56:20Z dreisner $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.95 -pkgrel=6 +pkgver=2.02.96 +pkgrel=2 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') @@ -13,26 +13,25 @@ groups=('base') source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} lvm2_install lvm2_hook - 11-dm-initramfs.rules) -sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85' - '45f5e31045065e7bdf5d6f2e21c857b4978024b4' + 11-dm-initramfs.rules + lvm.service + lvm2.conf) +sha1sums=('29d5097f0ca92c7665f29f862eca78bcf981ff6f' + '12e9016485c415c344524e6e75e23dfa6ca097ac' '3e1680f9b76ce9150d08865d99db90fd15532271' 'cedc9948123c870f9c5aa3357d0075b41a9c8135' - 'f6a554eea9557c3c236df2943bb6e7e723945c41') + 'f6a554eea9557c3c236df2943bb6e7e723945c41' + '17df8689630a77e46899a8bd56997d9db896d5af' + 'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4') build() { cd "${srcdir}/LVM2.${pkgver}" unset LDFLAGS - # libudev.so.1.0.0 compat - sed -i 's,udev_get_dev_path([^)]\+),"/dev",' \ - tools/dmsetup.c \ - lib/misc/lvm-wrappers.c - - ./configure --prefix=/ --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ + ./configure --prefix=/ --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ --includedir=/usr/include --with-usrlibdir=/usr/lib --libdir=/usr/lib --with-udev-prefix=/usr \ - --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ - --enable-udev_sync --enable-udev_rules + --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-pkgconfig --enable-readline \ + --enable-dmeventd --enable-cmdlib --enable-applib --enable-udev_sync --enable-udev_rules make } @@ -63,4 +62,7 @@ package_lvm2() { # mkinitcpio hook install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2" install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2" + # systemd support + install -D -m644 "${srcdir}/lvm.service" "${pkgdir}/usr/lib/systemd/system/lvm.service" + install -D -m644 "${srcdir}/lvm2.conf" "${pkgdir}/usr/lib/tmpfiles.d/lvm2.conf" } diff --git a/core/lvm2/lvm.service b/core/lvm2/lvm.service new file mode 100644 index 000000000..277d5a773 --- /dev/null +++ b/core/lvm2/lvm.service @@ -0,0 +1,16 @@ +[Unit] +Description=LVM activation +DefaultDependencies=no +Requires=systemd-udev-settle.service +After=systemd-udev-settle.service +Before=basic.target shutdown.target +Conflicts=shutdown.target + +[Service] +ExecStart=/sbin/vgchange --sysinit --available y +Type=oneshot +TimeoutSec=0 +RemainAfterExit=yes + +[Install] +WantedBy=basic.target diff --git a/core/lvm2/lvm2.conf b/core/lvm2/lvm2.conf new file mode 100644 index 000000000..129824552 --- /dev/null +++ b/core/lvm2/lvm2.conf @@ -0,0 +1,2 @@ +d /run/lock/lvm 0755 root root - +d /run/lvm 0755 root root - diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index f084b2ea5..3ac2cfefc 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 160638 2012-06-02 22:26:01Z allan $ +# $Id: PKGBUILD 162155 2012-06-22 12:56:36Z dreisner $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') pkgver=2.4.31 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.openldap.org/" license=('custom') makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux') source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz - slapd slapd.default + slapd slapd.default slapd.service ntlm.patch mutex-end-of-struct-sigsegv.patch) sha1sums=('8315a283fb3724abe6062e38d93bb69298d05765' 'bd1ea19256d3d467f1f803e0f4046ef50f17628f' 'd89b8a533045123f1ab46c9c430cf132d58a20a4' + 'a2cdab7e800a9f0c8b1e319a68598a12f4af27a4' 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef' '694269dad78c7a806649c2d7f57bb7e503df3af1') @@ -98,5 +99,6 @@ package_openldap() { install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd + install -Dm644 "${srcdir}"/slapd.service "${pkgdir}"/usr/lib/systemd/system/slapd.service install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/core/openldap/slapd.service b/core/openldap/slapd.service new file mode 100644 index 000000000..d8baa57b5 --- /dev/null +++ b/core/openldap/slapd.service @@ -0,0 +1,9 @@ +[Unit] +Description=OpenLDAP server daemon + +[Service] +Type=forking +ExecStart=/usr/sbin/slapd + +[Install] +WantedBy=multi-user.target diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index 66fb4603c..02fef6c1f 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,27 +1,38 @@ -# $Id: PKGBUILD 157930 2012-04-30 06:17:08Z bisson $ +# $Id: PKGBUILD 162156 2012-06-22 12:56:57Z dreisner $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh pkgver=6.0p1 -pkgrel=2 +pkgrel=3 pkgdesc='Free version of the SSH connectivity tools' url='http://www.openssh.org/portable.html' license=('custom:BSD') arch=('i686' 'x86_64') depends=('krb5' 'openssl' 'libedit' 'ldns') -optdepends=('x11-ssh-askpass: input passphrase in X without a terminal') +optdepends=('xorg-xauth: X11 forwarding' + 'x11-ssh-askpass: input passphrase in X') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" 'sshd.close-sessions' + 'sshdgenkeys.service' + 'sshd@.service' + 'sshd.service' + 'sshd.socket' + 'tmpfiles.d' 'sshd.confd' 'sshd.pam' 'sshd') sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422' '954bf1660aa32620c37034320877f4511b767ccb' + '6c71de2c2ca9622aa8e863acd94b135555e11125' + 'bd6eae36c7ef9efb7147778baad7858b81f2d660' + '83a257b8f6a62237383262cb0e2583e5609ddac0' + 'a30fb5fda6d0143345bae47684edaffb8d0a92a7' + 'b5cf44205e8f4365c00bfbee110d7c0e563627aa' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' '659e3ee95c269014783ff8b318c6f50bf7496fbd' - '21fa88de6cc1c7912e71655f50896ba17991a1c2') + 'ed36e3a522f619ff6b13e253526596e4cca11e9f') backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') @@ -41,6 +52,7 @@ build() { --with-xauth=/usr/bin/xauth \ --with-mantype=man \ --with-md5-passwords \ + --with-pid-dir=/run \ make } @@ -57,15 +69,22 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd - install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd - install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd - install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" - install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389 - rm "${pkgdir}"/usr/share/man/man1/slogin.1 ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz + install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" + + install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service + install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service + install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service + install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket + install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/openssh.conf + + install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389 + install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd + install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd + install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd + install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 diff --git a/core/openssh/sshd b/core/openssh/sshd index 1d68fb877..4bf4780f5 100755 --- a/core/openssh/sshd +++ b/core/openssh/sshd @@ -4,7 +4,7 @@ . /etc/rc.d/functions . /etc/conf.d/sshd -PIDFILE=/var/run/sshd.pid +PIDFILE=/run/sshd.pid PID=$(cat $PIDFILE 2>/dev/null) if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then PID= diff --git a/core/openssh/sshd.service b/core/openssh/sshd.service new file mode 100644 index 000000000..7c8f88372 --- /dev/null +++ b/core/openssh/sshd.service @@ -0,0 +1,19 @@ +[Unit] +Description=OpenSSH Daemon +After=sshdgenkeys.service + +[Service] +ExecStart=/usr/sbin/sshd -D +ExecReload=/bin/kill -HUP $MAINPID +KillMode=process +Restart=always + +[Install] +WantedBy=multi-user.target +Also=sshdgenkeys.service + +# Note that this is the service file for running a single SSH server for all +# incoming connections, suitable only for systems with a large amount of SSH +# traffic. In almost all other cases it is a better idea to use sshd.socket + +# sshd@.service (i.e. the on-demand spawning version for one instance per +# connection). diff --git a/core/openssh/sshd.socket b/core/openssh/sshd.socket new file mode 100644 index 000000000..6a67bfe86 --- /dev/null +++ b/core/openssh/sshd.socket @@ -0,0 +1,10 @@ +[Unit] +Conflicts=sshd.service + +[Socket] +ListenStream=22 +Accept=yes + +[Install] +WantedBy=sockets.target +Also=sshdgenkeys.service diff --git a/core/openssh/sshdgenkeys.service b/core/openssh/sshdgenkeys.service new file mode 100644 index 000000000..47c1c3fd6 --- /dev/null +++ b/core/openssh/sshdgenkeys.service @@ -0,0 +1,18 @@ +[Unit] +Description=SSH Key Generation +ConditionPathExists=|!/etc/ssh/ssh_host_key +ConditionPathExists=|!/etc/ssh/ssh_host_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub + +[Service] +ExecStart=/usr/bin/ssh-keygen -A +Type=oneshot +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/core/openssh/tmpfiles.d b/core/openssh/tmpfiles.d new file mode 100644 index 000000000..7c5b26100 --- /dev/null +++ b/core/openssh/tmpfiles.d @@ -0,0 +1 @@ +d /var/empty 0755 root root - |