From 5aa2f34f73b7ff0b24415a7d1b850b436ce12959 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 16 Apr 2010 22:09:33 +0200 Subject: [PATCH] Update packages that use $openrc_services with the third argument. Packages that can be started without modifications are enabled, well some of them, otherwise disabled. --HG-- extra : convert_revision : 42105adabbc02b0f07a5d7173664778a5001c739 --- srcpkgs/NetworkManager/template | 4 ++-- srcpkgs/acpid/template | 3 ++- srcpkgs/anacron/template | 6 +++--- srcpkgs/avahi/template | 4 ++-- srcpkgs/bluez/template | 3 ++- srcpkgs/cronie/template | 4 ++-- srcpkgs/dbus/template | 4 ++-- srcpkgs/dhcpcd/template | 3 ++- srcpkgs/dnsmasq/template | 14 +++++++++----- srcpkgs/fuse/template | 5 +++-- srcpkgs/gdm/template | 3 ++- srcpkgs/glibc/nscd.template | 4 ++-- srcpkgs/hal/template | 4 ++-- srcpkgs/iptables/template | 5 ++++- srcpkgs/lvm2/template | 3 ++- srcpkgs/metalog/template | 4 ++-- srcpkgs/nfs-utils/template | 6 +++++- srcpkgs/ntp/template | 3 ++- srcpkgs/openssh/openssh-server.template | 4 ++-- srcpkgs/portmap/template | 4 ++-- srcpkgs/postgresql/template | 4 ++-- srcpkgs/rsyslog/template | 3 ++- srcpkgs/udev/template | 3 ++- srcpkgs/wicd/template | 3 ++- srcpkgs/wpa_supplicant/template | 4 ++-- srcpkgs/xen/template | 6 +++++- 26 files changed, 69 insertions(+), 44 deletions(-) diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index 652d92637b..f5d020d787 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -1,7 +1,7 @@ # Template file for 'NetworkManager' pkgname=NetworkManager version=0.8 -revision=1 +revision=2 distfiles="${GNOME_SITE}/$pkgname/0.8/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--localstatedir=/var --with-distro=gentoo @@ -14,7 +14,7 @@ long_desc=" This packages common libraries for the GNOME desktop." keep_empty_dirs=yes -openrc_services="NetworkManager default" +openrc_services="NetworkManager default true" conf_files="/etc/NetworkManager/nm-system-settings.conf" subpackages="$pkgname-devel" diff --git a/srcpkgs/acpid/template b/srcpkgs/acpid/template index 1dd1b3f46e..e720e2ef48 100644 --- a/srcpkgs/acpid/template +++ b/srcpkgs/acpid/template @@ -1,6 +1,7 @@ # Template file for 'acpid' pkgname=acpid version=1.0.10 +revision=1 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_makefile make_install_args="INSTPREFIX=$XBPS_DESTDIR/$pkgname-$version @@ -14,7 +15,7 @@ long_desc=" Any event that publishes itself to /proc/acpi/event can be handled." keep_empty_dirs=yes -openrc_services="acpid default" +openrc_services="acpid default true" conf_files="/etc/conf.d/acpid" Add_dependency full glibc diff --git a/srcpkgs/anacron/template b/srcpkgs/anacron/template index 16807b6be1..a5b08fe3b3 100644 --- a/srcpkgs/anacron/template +++ b/srcpkgs/anacron/template @@ -1,7 +1,7 @@ # Template file for 'anacron' pkgname=anacron version=2.3 -revision=1 +revision=2 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_makefile make_install_args="PREFIX=$XBPS_DESTDIR/$pkgname-$version @@ -20,9 +20,9 @@ long_desc=" keep_empty_dirs=yes conf_files="/etc/anacrontab" -openrc_services="anacrond default" +openrc_services="anacrond default true" -Add_dependency full glibc +Add_dependency run glibc Add_dependency full bash Add_dependency full run-parts diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template index 8ce3e07098..610bcf6cfc 100644 --- a/srcpkgs/avahi/template +++ b/srcpkgs/avahi/template @@ -1,7 +1,7 @@ # Template file for 'avahi' pkgname=avahi version=0.6.25 -revision=4 +revision=5 distfiles="http://www.avahi.org/download/avahi-$version.tar.gz" build_style=gnu_configure configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc @@ -22,7 +22,7 @@ long_desc=" # Create avahi and netdev system accounts. system_accounts="avahi netdev" -openrc_services="avahi-daemon default avahi-dnsconfd default" +openrc_services="avahi-daemon default true avahi-dnsconfd default true" conf_files="/etc/avahi/avahi-daemon.conf /etc/avahi/hosts.conf" subpackages="$pkgname-autoipd $pkgname-discover $pkgname-compat-libs" diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template index 2328c58f10..85ab84359e 100644 --- a/srcpkgs/bluez/template +++ b/srcpkgs/bluez/template @@ -1,6 +1,7 @@ # Template file for 'bluez' pkgname=bluez version=4.61 +revision=1 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--localstatedir=/var --libexecdir=/lib --enable-gstreamer @@ -23,7 +24,7 @@ conf_files=" /etc/bluetooth/main.conf /etc/bluetooth/network.conf /etc/bluetooth/rfcomm.conf" -openrc_services="bluetooth default" +openrc_services="bluetooth default true" subpackages="$pkgname-alsa $pkgname-compat $pkgname-gstreamer libbluetooth" subpackages="$subpackages libbluetooth-devel" diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template index 6ac2a1bac8..3e11d2099e 100644 --- a/srcpkgs/cronie/template +++ b/srcpkgs/cronie/template @@ -1,7 +1,7 @@ # Template file for 'cronie' pkgname=cronie version=1.4.3 -revision=1 +revision=2 distfiles="https://fedorahosted.org/releases/c/r/cronie/cronie-$version.tar.gz" build_style=gnu_configure configure_args="--with-inotify --without-selinux --with-pam --disable-anacron @@ -18,7 +18,7 @@ long_desc=" keep_empty_dirs=yes conf_files="/etc/crontab" -openrc_services="crond default" +openrc_services="crond default true" Add_dependency run glibc Add_dependency run pam diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template index d3ad62877e..681c05fcb1 100644 --- a/srcpkgs/dbus/template +++ b/srcpkgs/dbus/template @@ -1,7 +1,7 @@ # Template file for 'dbus' pkgname=dbus version=1.2.24 -revision=1 +revision=2 distfiles="http://dbus.freedesktop.org/releases/dbus/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--disable-selinux --enable-userdb-cache --with-xml=expat @@ -24,7 +24,7 @@ long_desc=" keep_empty_dirs=yes conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf" subpackages="$pkgname-devel $pkgname-libs" -openrc_services="dbus default" +openrc_services="dbus default true" system_accounts="dbus" Add_dependency run glibc diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template index 37a35ed719..029a082022 100644 --- a/srcpkgs/dhcpcd/template +++ b/srcpkgs/dhcpcd/template @@ -1,6 +1,7 @@ # Template file for 'dhcpcd' pkgname=dhcpcd version=5.2.2 +revision=1 distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-$version.tar.bz2" build_style=configure configure_args="--libexecdir=/lib/dhcpcd" @@ -19,7 +20,7 @@ Add_dependency run glibc Add_dependency build ntp conf_files="/etc/dhcpcd.conf" -openrc_services="dhcpcd default" +openrc_services="dhcpcd default false" post_install() { diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template index 1392a45105..3eb7753956 100644 --- a/srcpkgs/dnsmasq/template +++ b/srcpkgs/dnsmasq/template @@ -1,6 +1,7 @@ # Template file for 'dnsmasq' pkgname=dnsmasq version=2.51 +revision=1 distfiles="http://www.thekelleys.org.uk/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_makefile make_build_target="all-i18n" @@ -18,13 +19,16 @@ long_desc=" dynamic DHCP leases and BOOTP/TFTP/PXE for network booting of diskless machines." conf_files="/etc/dnsmasq.conf /etc/conf.d/dnsmasq" -openrc_services="dnsmasq default" +openrc_services="dnsmasq default false" -Add_dependency full glibc -Add_dependency full dbus -Add_dependency full libcap -Add_dependency full libidn +Add_dependency run glibc +Add_dependency run dbus-libs +Add_dependency run libcap +Add_dependency run libidn Add_dependency build gettext +Add_dependency build dbus-devel +Add_dependency build libcap-devel +Add_dependency build libidn-devel post_install() { diff --git a/srcpkgs/fuse/template b/srcpkgs/fuse/template index 8965262a29..8b8fa3a81b 100644 --- a/srcpkgs/fuse/template +++ b/srcpkgs/fuse/template @@ -1,6 +1,7 @@ # Template file for 'fuse' pkgname=fuse version=2.8.1 +revision=1 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--enable-lib --enable-util --bindir=/bin" @@ -20,8 +21,8 @@ long_desc=" * Has proven very stable over time" subpackages="$pkgname-devel" -openrc_services="fuse default" -Add_dependency full glibc +openrc_services="fuse default true" +Add_dependency run glibc post_install() { diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index c8e79db38e..b3457f7244 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,6 +1,7 @@ # Template file for 'gdm' pkgname=gdm version=2.30.0 +revision=1 distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-schemas-install --disable-scrollkeeper @@ -34,7 +35,7 @@ gtk_iconcache_dirs="/usr/share/icons/hicolor" system_accounts="gdm" gdm_homedir="/var/lib/gdm" gdm_descr="GNOME Display Manager user" -openrc_services="gdm default" +openrc_services="gdm default true" Add_dependency run glibc Add_dependency run libX11 diff --git a/srcpkgs/glibc/nscd.template b/srcpkgs/glibc/nscd.template index d5fef0512a..d2a3456936 100644 --- a/srcpkgs/glibc/nscd.template +++ b/srcpkgs/glibc/nscd.template @@ -5,9 +5,9 @@ long_desc=" This package contains nscd, a daemon that provides a cache for the most common name service requests." -revision=1 +revision=2 -openrc_services="nscd default" +openrc_services="nscd default false" conf_files="/etc/nscd.conf" Add_dependency run glibc diff --git a/srcpkgs/hal/template b/srcpkgs/hal/template index d4a6117778..33f68c247b 100644 --- a/srcpkgs/hal/template +++ b/srcpkgs/hal/template @@ -1,7 +1,7 @@ # Template file for 'hal' pkgname=hal version=0.5.14 -revision=2 +revision=3 distfiles="http://hal.freedesktop.org/releases/hal-$version.tar.bz2" build_style=gnu_configure configure_args="--enable-static=no --disable-console-kit @@ -21,7 +21,7 @@ keep_empty_dirs=yes conf_files=" /etc/dbus-1/system.d/hal.conf /etc/hal/fdi/policy/10-keymap.fdi" -openrc_services="hal default" +openrc_services="hal default true" # Create hal system account. system_accounts="hal" diff --git a/srcpkgs/iptables/template b/srcpkgs/iptables/template index 004e7ba60d..9d49431917 100644 --- a/srcpkgs/iptables/template +++ b/srcpkgs/iptables/template @@ -1,6 +1,7 @@ # Template file for 'iptables' pkgname=iptables version=1.4.7 +revision=1 distfiles="http://www.iptables.org/projects/iptables/files/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--enable-devel --enable-libipq --sbindir=/sbin @@ -19,7 +20,7 @@ long_desc=" The iptables package also includes ip6tables. ip6tables is used for configuring the IPv6 packet filter." -openrc_services="iptables default" +openrc_services="iptables default false" conf_files=" /etc/conf.d/iptables /etc/conf.d/ip6tables" @@ -31,6 +32,8 @@ Add_dependency build kernel-headers pre_configure() { + export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH" + sed -i '87 i libxt_RATEEST.so: libxt_RATEEST.oo' \ ${wrksrc}/extensions/GNUmakefile.in sed -i '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' \ diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template index 739f8f13f5..2d493fa489 100644 --- a/srcpkgs/lvm2/template +++ b/srcpkgs/lvm2/template @@ -1,6 +1,7 @@ # Template file for 'lvm2' pkgname=lvm2 version=2.02.62 +revision=1 wrksrc=LVM2.${version} distfiles="ftp://sources.redhat.com/pub/lvm2/LVM2.${version}.tgz" build_style=gnu_configure @@ -24,7 +25,7 @@ keep_empty_dirs=yes subpackages="liblvm2app liblvm2app-devel device-mapper device-mapper-devel" conf_files="/etc/lvm/lvm.conf" triggers="initramfs-tools" -openrc_services="lvm2 shutdown" +openrc_services="lvm2 shutdown true" Add_dependency run glibc Add_dependency run bash diff --git a/srcpkgs/metalog/template b/srcpkgs/metalog/template index f259dc6db3..b2697a7740 100644 --- a/srcpkgs/metalog/template +++ b/srcpkgs/metalog/template @@ -1,7 +1,7 @@ # Template file for 'metalog' pkgname=metalog version=1 -revision=3 +revision=4 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.lzma" build_style=gnu_configure configure_args="--with-unicode" @@ -14,7 +14,7 @@ long_desc=" and/or Perl-compatible regular expressions." conf_files="/etc/metalog.conf" -openrc_services="metalog default" +openrc_services="metalog default true" Add_dependency full glibc Add_dependency full pcre diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template index 8998bfffed..bf84c20f14 100644 --- a/srcpkgs/nfs-utils/template +++ b/srcpkgs/nfs-utils/template @@ -1,6 +1,7 @@ # Template file for 'nfs-utils' pkgname=nfs-utils version=1.2.0 +revision=1 distfiles="http://downloads.sf.net/nfs/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--with-statduser=nobody --disable-gss --disable-nfsv4 @@ -13,7 +14,10 @@ long_desc=" related tools, which provides a much higher level of performance than the traditional Linux NFS server used by most users." -openrc_services="mountd default nfsd default nfslock default" +openrc_services=" +mountd default false +nfsd default false +nfslock default false" conf_files="/etc/exports" Add_dependency full glibc diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template index ded71afc3a..c439ab39df 100644 --- a/srcpkgs/ntp/template +++ b/srcpkgs/ntp/template @@ -1,6 +1,7 @@ # Template file for 'ntp' pkgname=ntp version=4.2.6p1 +revision=1 distfiles="http://archive.ntp.org/ntp4/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--enable-linuxcaps --enable-getifaddrs=glibc @@ -17,7 +18,7 @@ long_desc=" subpackages="$pkgname-perl" conf_files="/etc/ntp.conf" -openrc_services="ntpd default" +openrc_services="ntpd default true" system_accounts="ntpd" ntpd_homedir="/var/chroot/ntpd" diff --git a/srcpkgs/openssh/openssh-server.template b/srcpkgs/openssh/openssh-server.template index 60e7138590..cc027a3f77 100644 --- a/srcpkgs/openssh/openssh-server.template +++ b/srcpkgs/openssh/openssh-server.template @@ -5,10 +5,10 @@ long_desc="${long_desc} This package contains the ${pkgname} server files." -revision=1 +revision=2 keep_empty_dirs=yes conf_files="/etc/ssh/sshd_config /etc/pam.d/sshd" -openrc_services="sshd default" +openrc_services="sshd default false" Add_dependency run glibc Add_dependency run zlib diff --git a/srcpkgs/portmap/template b/srcpkgs/portmap/template index 193495eeac..0e2d65cefe 100644 --- a/srcpkgs/portmap/template +++ b/srcpkgs/portmap/template @@ -1,7 +1,7 @@ # Template file for 'portmap' pkgname=portmap version=6.0 -revision=2 +revision=3 wrksrc="${pkgname}_${version}" distfiles="http://neil.brown.name/$pkgname/$pkgname-$version.tgz" build_style=gnu_makefile @@ -14,7 +14,7 @@ long_desc=" remote procedure calls between computer programs. It is use widely by NFS and NIS, and assorted other systems." -openrc_services="portmap default" +openrc_services="portmap default true" Add_dependency full glibc Add_dependency build tcp_wrappers diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template index 65cc05393f..5212338a3b 100644 --- a/srcpkgs/postgresql/template +++ b/srcpkgs/postgresql/template @@ -1,7 +1,7 @@ # Template file for 'postgresql' pkgname=postgresql version=8.4.2 -revision=1 +revision=2 distfiles="ftp://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2" build_style=gnu_configure configure_args="--with-docdir=/usr/share/doc --with-openssl --with-python @@ -31,7 +31,7 @@ postgres_shell="/bin/sh" postgres_descr="PostgreSQL database server user" # Add the OpenRC service. -openrc_services="postgresql default" +openrc_services="postgresql default false" Add_dependency run glibc Add_dependency run pam diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template index c5f6601b19..74ae6c19c5 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -1,6 +1,7 @@ # Template file for 'rsyslog' pkgname=rsyslog version=4.6.2 +revision=1 distfiles="http://download.rsyslog.com/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--enable-gnutls --enable-mysql --enable-pgsql" @@ -14,7 +15,7 @@ long_desc=" subpackages="$pkgname-gnutls $pkgname-mysql $pkgname-postgresql" conf_files="/etc/rsyslog.conf /etc/conf.d/rsyslogd" -openrc_services="rsyslogd default" +openrc_services="rsyslogd default true" Add_dependency run glibc Add_dependency run zlib diff --git a/srcpkgs/udev/template b/srcpkgs/udev/template index 172f5489a1..6bbd197ee7 100644 --- a/srcpkgs/udev/template +++ b/srcpkgs/udev/template @@ -1,6 +1,7 @@ # Template file for 'udev' pkgname=udev version=151 +revision=1 distfiles="${KERNEL_SITE}/utils/kernel/hotplug/udev-${version}.tar.bz2" build_style=gnu_configure configure_args="--exec-prefix= --without-selinux --libexecdir=/lib/udev @@ -13,7 +14,7 @@ long_desc=" /sbin/hotplug. It requires a 2.5/2.6 kernel to run properly." keep_empty_dirs=yes -openrc_services="udev sysinit" +openrc_services="udev sysinit true" conf_files="/etc/udev/udev.conf" subpackages="libudev libudev-devel libgudev libgudev-devel" diff --git a/srcpkgs/wicd/template b/srcpkgs/wicd/template index e1545bcc32..16783ca2fa 100644 --- a/srcpkgs/wicd/template +++ b/srcpkgs/wicd/template @@ -1,6 +1,7 @@ # Template file for 'wicd' pkgname=wicd version=1.7.0 +revision=1 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" build_style=custom-install short_desc="Open source wired and wireless network manager" @@ -29,7 +30,7 @@ conf_files=" /etc/dbus-1/system.d/wicd.conf /etc/wicd/encryption/templates/active" gtk_iconcache_dirs="/usr/share/icons/hicolor" -openrc_services="wicd default" +openrc_services="wicd default false" Add_dependency full dbus-python Add_dependency full pygtk diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index 7743d81be4..a7873032a5 100644 --- a/srcpkgs/wpa_supplicant/template +++ b/srcpkgs/wpa_supplicant/template @@ -1,7 +1,7 @@ # Template file for 'wpa_supplicant' pkgname=wpa_supplicant version=0.7.0 -revision=1 +revision=2 wrksrc=${pkgname}-${version}/${pkgname} distfiles="http://hostap.epitest.fi/releases/$pkgname-$version.tar.gz" build_style=gnu_makefile @@ -24,7 +24,7 @@ long_desc=" (wpa_cli) and a GUI (wpa_gui) are included with $pkgname." conf_files="/etc/${pkgname}.conf" -openrc_services="$pkgname default" +openrc_services="$pkgname default false" Add_dependency run glibc Add_dependency run libnl diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template index 9748923370..1c0943af53 100644 --- a/srcpkgs/xen/template +++ b/srcpkgs/xen/template @@ -1,6 +1,7 @@ # Template file for 'xen' pkgname=xen version=4.0.0 +revision=1 wrksrc=xen-${version} distfiles="http://bits.xensource.com/oss-xen/release/$version/xen-$version.tar.gz" build_style=gnu_makefile @@ -15,7 +16,7 @@ long_desc=" nostrip=yes subpackages="xen-devel" -openrc_services="xend default" +openrc_services="xend default true" conf_files=" /etc/sysconfig/xendomains @@ -66,6 +67,9 @@ Add_dependency build acpica-utils pre_build() { + # Use tools from coreutils. + export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH" + install -d ${DESTDIR} cd ${DESTDIR} && ln -sf . install