From 0c2afe61eb7022265c55fe6bac8622ff1199de70 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 5 Oct 2012 18:45:37 +0200 Subject: [PATCH] Revbump pkgs that use tmpfiles.d(5) and/or modules-load.d(5). --- srcpkgs/apache/files/apache.tmpfiles | 3 +++ srcpkgs/apache/template | 5 ----- srcpkgs/cyrus-sasl/template | 2 +- srcpkgs/ecryptfs-utils/template | 2 +- srcpkgs/gdm/template | 3 +-- srcpkgs/glibc/files/nscd.tmpfiles.d | 1 + srcpkgs/glibc/nscd.template | 1 - srcpkgs/glibc/template | 2 +- srcpkgs/mysql/template | 2 +- srcpkgs/nvidia/template | 2 +- srcpkgs/samba/files/samba.tmpfiles | 4 ++++ srcpkgs/samba/template | 8 +------- srcpkgs/virtualbox-ose/template | 2 +- srcpkgs/wpa_supplicant/template | 2 +- 14 files changed, 17 insertions(+), 22 deletions(-) diff --git a/srcpkgs/apache/files/apache.tmpfiles b/srcpkgs/apache/files/apache.tmpfiles index 4f7850230f..835af93f4c 100644 --- a/srcpkgs/apache/files/apache.tmpfiles +++ b/srcpkgs/apache/files/apache.tmpfiles @@ -1 +1,4 @@ d /run/httpd 710 root httpd +d /var/log/httpd 755 root httpd +d /srv/httpd 755 root httpd +d /srv/httpd/cgi-bin 755 root httpd diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template index f0ecc168d0..bd849c58f0 100644 --- a/srcpkgs/apache/template +++ b/srcpkgs/apache/template @@ -54,11 +54,6 @@ conf_files=" systemd_services="apache.service on" -make_dirs=" -/var/log/httpd 755 root httpd -/srv/httpd 755 root httpd -/srv/httpd/cgi-bin 755 root httpd" - system_accounts="httpd" httpd_descr="Apache HTTP server" httpd_homedir="/srv/httpd" diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template index 9becbbfd05..b4483e202c 100644 --- a/srcpkgs/cyrus-sasl/template +++ b/srcpkgs/cyrus-sasl/template @@ -1,7 +1,7 @@ # Template file for 'cyrus-sasl' pkgname=cyrus-sasl version=2.1.23 -revision=9 +revision=10 wrksrc="cyrus-sasl-${version}" patch_args="-Np1" depends="cyrus-sasl-modules>=${version}_${revision}" diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template index 7ca85fd781..035599bb4a 100644 --- a/srcpkgs/ecryptfs-utils/template +++ b/srcpkgs/ecryptfs-utils/template @@ -1,7 +1,7 @@ # Template file for 'ecryptfs-utils' pkgname=ecryptfs-utils version=100 -revision=1 +revision=2 build_style=gnu-configure subpackages="libecryptfs libecryptfs-devel ${pkgname}-python" configure_args="--with-pamdir=/usr/lib/security --enable-gpg --enable-gui" diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index 598ae69d17..5c66c98310 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,7 +1,7 @@ # Template file for 'gdm' pkgname=gdm version=3.6.0 -revision=4 +revision=5 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static --with-at-spi-registryd-directory=/usr/libexec --without-tcp-wrappers @@ -35,7 +35,6 @@ long_desc=" subpackages="libgdm gdm-devel" - conf_files=" /etc/gdm/custom.conf /etc/pam.d/gdm diff --git a/srcpkgs/glibc/files/nscd.tmpfiles.d b/srcpkgs/glibc/files/nscd.tmpfiles.d index 3bbd71fc7e..b670496349 100644 --- a/srcpkgs/glibc/files/nscd.tmpfiles.d +++ b/srcpkgs/glibc/files/nscd.tmpfiles.d @@ -1 +1,2 @@ d /var/run/nscd 0755 root root - +d /var/db/nscd 0755 root root - diff --git a/srcpkgs/glibc/nscd.template b/srcpkgs/glibc/nscd.template index e60d23fe35..a99e8bf21d 100644 --- a/srcpkgs/glibc/nscd.template +++ b/srcpkgs/glibc/nscd.template @@ -1,7 +1,6 @@ # Template file for 'nscd'. # systemd_services="nscd.service on" -make_dirs="/var/db/nscd 0755 root root" conf_files="/etc/nscd.conf" short_desc="Name Service Cache Daemon" long_desc=" diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index 374d3a86e9..89567ff517 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -2,7 +2,7 @@ pkgname=glibc _majorver=2.16 version=${_majorver}.0 -revision=8 +revision=9 short_desc="The GNU C library" maintainer="Juan RP " homepage="http://www.gnu.org/software/libc" diff --git a/srcpkgs/mysql/template b/srcpkgs/mysql/template index 23db56085c..283620abed 100644 --- a/srcpkgs/mysql/template +++ b/srcpkgs/mysql/template @@ -1,7 +1,7 @@ # Template file for 'mysql' pkgname=mysql version=5.5.27 -revision=1 +revision=2 depends="mysql-client" makedepends="perl cmake bison zlib-devel ncurses-devel openssl-devel readline-devel" short_desc="The world's most popular open source database" diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template index 9a90a5e316..65193bcfd4 100644 --- a/srcpkgs/nvidia/template +++ b/srcpkgs/nvidia/template @@ -1,7 +1,7 @@ # Template file for 'nvidia' pkgname=nvidia version=304.51 -revision=1 +revision=2 short_desc="NVIDIA drivers for linux" maintainer="Juan RP " license="Propietary NVIDIA license" diff --git a/srcpkgs/samba/files/samba.tmpfiles b/srcpkgs/samba/files/samba.tmpfiles index 983564a102..a3b76a8639 100644 --- a/srcpkgs/samba/files/samba.tmpfiles +++ b/srcpkgs/samba/files/samba.tmpfiles @@ -1,2 +1,6 @@ # Required directories at runtime by samba. d /run/samba/socket 0755 root root - - +d /etc/samba/private 0700 root root - - +d /var/samba 0750 root root - - +d /var/spool/samba 1777 root root - - +d /var/log/samba 0750 root root - - diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template index 10fc2ef2fc..568684a596 100644 --- a/srcpkgs/samba/template +++ b/srcpkgs/samba/template @@ -1,7 +1,7 @@ # Template file for 'samba' pkgname=samba version=3.6.8 -revision=1 +revision=2 build_wrksrc=source3 build_style=gnu-configure configure_args="--with-fhs --with-pam --with-pam_smbpass --with-ldap @@ -37,12 +37,6 @@ nmbd.service off smbd.service off winbindd.service off" -make_dirs=" -/etc/samba/private 0700 root root -/var/samba 0750 root root -/var/spool/samba 1777 root root -/var/log/samba 0750 root root" - conf_files="/etc/samba/smb.conf /etc/pam.d/samba" post_install() { diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index eb204740cc..22b1d5bfaf 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -2,7 +2,7 @@ pkgname=virtualbox-ose _vbox_distver=4.2.0 version=${_vbox_distver} -revision=2 +revision=3 wrksrc="VirtualBox-${version}" patch_args="-Np1" depends="virtualbox-ose-dkms>=4.1.16 hicolor-icon-theme desktop-file-utils" diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index e4d276c33a..46a73884cb 100644 --- a/srcpkgs/wpa_supplicant/template +++ b/srcpkgs/wpa_supplicant/template @@ -1,7 +1,7 @@ # Template file for 'wpa_supplicant' pkgname=wpa_supplicant version=1.0 -revision=3 +revision=4 build_wrksrc=$pkgname makedepends="pkg-config libnl3-devel openssl-devel dbus-devel readline-devel" conf_files="/etc/${pkgname}.conf"