From bf547c9043b91d9a7d8785e1cc5a5c6f74fe499c Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Wed, 22 Nov 2006 00:38:00 +0000 Subject: packages: Update the packages that use volatiles to pass update as a parameter to populate-volatiles.sh to ensure that the volatiles cache is updated (if its in use) when a package is added after the initial boot. The update parameter is ignore is the cache is not in use and by older versions of populate-volatiles.sh that don't support this parameter. --- packages/bogofilter/bogofilter_0.96.0.bb | 4 ++-- packages/clamav/clamav.inc | 6 +++--- packages/clamav/clamav_0.88.5.bb | 2 +- packages/clamav/clamav_0.88.6.bb | 2 +- packages/cyrus-imapd/cyrus-imapd_2.2.12.bb | 4 ++-- packages/davfs2/davfs2_0.2.8.bb | 4 ++-- packages/havp/havp_0.82.bb | 4 ++-- packages/networkmanager/networkmanager_0.6.4.bb | 5 ++++- packages/p3scan/p3scan_2.9.05d.bb | 4 ++-- packages/postfix/postfix_2.0.20.bb | 4 ++-- 10 files changed, 21 insertions(+), 18 deletions(-) diff --git a/packages/bogofilter/bogofilter_0.96.0.bb b/packages/bogofilter/bogofilter_0.96.0.bb index 0b85c96ada..dba0893b2b 100644 --- a/packages/bogofilter/bogofilter_0.96.0.bb +++ b/packages/bogofilter/bogofilter_0.96.0.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Bogofilter is a mail filter that classifies mail as spam or ham ( by a statistical analysis of the message's header and content (body). \ The program is able to learn from the user's classifications and corrections." LICENSE = "GPL" -PR = "r5" +PR = "r6" PRIORITY = "optional" SRC_URI = "http://download.sourceforge.net/bogofilter/bogofilter-${PV}.tar.bz2 \ @@ -34,5 +34,5 @@ pkg_postinst () { echo "bogofilter unix - n n - - pipe" >> /etc/postfix/master.cf echo " flags=R user=bogo argv=/usr/bin/postfix-filter.sh -f ${sender} -- ${recipient}" >> /etc/postfix/master.cf } - /etc/init.d/populate-volatile.sh + /etc/init.d/populate-volatile.sh update } diff --git a/packages/clamav/clamav.inc b/packages/clamav/clamav.inc index 2a09c52461..b18cd06c24 100644 --- a/packages/clamav/clamav.inc +++ b/packages/clamav/clamav.inc @@ -93,21 +93,21 @@ pkg_postinst_${PN}-freshclam () { grep -q clamav: /etc/passwd || \ adduser --disabled-password --home=/var/lib/clamav/ --system \ --ingroup clamav --no-create-home -g "ClamAV" clamav - /etc/init.d/populate-volatile.sh + /etc/init.d/populate-volatile.sh update } pkg_postinst_${PN}-daemon () { grep -q clamav: /etc/group || addgroup clamav grep -q clamav: /etc/passwd || \ adduser --disabled-password --home=/var/lib/clamav/ --system \ --ingroup clamav --no-create-home -g "ClamAV" clamav - /etc/init.d/populate-volatile.sh + /etc/init.d/populate-volatile.sh update } pkg_postinst_${PN}-data () { grep -q clamav: /etc/group || addgroup clamav grep -q clamav: /etc/passwd || \ adduser --disabled-password --home=/var/lib/clamav/ --system \ --ingroup clamav --no-create-home -g "ClamAV" clamav - /etc/init.d/populate-volatile.sh + /etc/init.d/populate-volatile.sh update } # Indicate that the default files are configuration files diff --git a/packages/clamav/clamav_0.88.5.bb b/packages/clamav/clamav_0.88.5.bb index fec4ae59d8..e721558efe 100644 --- a/packages/clamav/clamav_0.88.5.bb +++ b/packages/clamav/clamav_0.88.5.bb @@ -1,3 +1,3 @@ require clamav.inc -PR = "r0" +PR = "r1" diff --git a/packages/clamav/clamav_0.88.6.bb b/packages/clamav/clamav_0.88.6.bb index fec4ae59d8..e721558efe 100644 --- a/packages/clamav/clamav_0.88.6.bb +++ b/packages/clamav/clamav_0.88.6.bb @@ -1,3 +1,3 @@ require clamav.inc -PR = "r0" +PR = "r1" diff --git a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb index 1bb806cb22..14fb728304 100644 --- a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb +++ b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb @@ -1,7 +1,7 @@ SECTION = "console/network" DEPENDS = "cyrus-sasl virtual/db" LICENSE = "BSD" -PR = "r8" +PR = "r9" DEPENDS += "install-native" SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \ @@ -44,7 +44,7 @@ do_install_append () { } pkg_postinst () { - /etc/init.d/populate-volatile.sh + /etc/init.d/populate-volatile.sh update } pkg_postrm () { diff --git a/packages/davfs2/davfs2_0.2.8.bb b/packages/davfs2/davfs2_0.2.8.bb index a95bdde228..f5a6f3458d 100644 --- a/packages/davfs2/davfs2_0.2.8.bb +++ b/packages/davfs2/davfs2_0.2.8.bb @@ -6,7 +6,7 @@ DEPENDS = "neon-0.25.5" RDEPENDS_${PN} = "kernel-module-coda" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/dav/${P}.tar.gz \ file://Makefile.in.patch;patch=1 \ @@ -35,7 +35,7 @@ do_install_append () { pkg_postinst () { update-alternatives --install ${ALTERNATIVE_LINK} ${ALTERNATIVE_NAME} \ ${ALTERNATIVE_PATH} ${ALTERNATIVE_PRIORITY} - /etc/init.d/populate-volatile.sh + /etc/init.d/populate-volatile.sh update } pkg_prerm () { diff --git a/packages/havp/havp_0.82.bb b/packages/havp/havp_0.82.bb index 3a3cce41df..f4298d9d07 100644 --- a/packages/havp/havp_0.82.bb +++ b/packages/havp/havp_0.82.bb @@ -8,7 +8,7 @@ SECTION = "network" LICENSE = "GPLv2" DEPENDS = "clamav" RDEPENDS_${PN} += "${PN}-templates-css2 ${PN}-templates-en" -PR = "r2" +PR = "r3" SRC_URI = "http://www.server-side.de/download/havp-${PV}.tar.gz \ file://sysconfdir-is-etc.patch;patch=1 \ @@ -79,7 +79,7 @@ pkg_postinst_${PN} () { grep -q havp: /etc/passwd || \ adduser --disabled-password --home=${localstatedir}/lib/havp/ --system \ --ingroup havp --no-create-home -g "HAVP" havp - /etc/init.d/populate-volatile.sh + /etc/init.d/populate-volatile.sh update } CONFFILES_${PN} = "${sysconfdir}/havp/havp.config \ diff --git a/packages/networkmanager/networkmanager_0.6.4.bb b/packages/networkmanager/networkmanager_0.6.4.bb index e2575ed466..95e85002b0 100644 --- a/packages/networkmanager/networkmanager_0.6.4.bb +++ b/packages/networkmanager/networkmanager_0.6.4.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" DEPENDS = "libnl dbus dbus-glib libhal-nm libgpewidget gnome-keyring gconf-dbus wireless-tools libglade" RDEPENDS = "wpa-supplicant iproute2 dhcdbd gnome-keyring hicolor-icon-theme" -PR = "r3" +PR = "r4" SRC_URI="http://www.handhelds.org/~mmp/files/NetworkManager-${PV}-gpe.tar.gz \ file://dbus-api-fix.patch;patch=1 \ @@ -48,6 +48,9 @@ do_install () { install -m 0755 ${WORKDIR}/nm-applet.desktop ${D}/${datadir}/ } +pkg_postinst () { + /etc/init.d/populate-volatile.sh update +} FILES_${PN} += "${datadir} \ ${libdir}/*.so* \ diff --git a/packages/p3scan/p3scan_2.9.05d.bb b/packages/p3scan/p3scan_2.9.05d.bb index a599685ee1..328ae6ede0 100644 --- a/packages/p3scan/p3scan_2.9.05d.bb +++ b/packages/p3scan/p3scan_2.9.05d.bb @@ -6,7 +6,7 @@ SECTION = "network" LICENSE = "GPLv2" DEPENDS = "gmp bzip2 zlib clamav openssl" RDEPENDS_${PN} = "${PN}-templates-en" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/p3scan/p3scan-2.9.05d.tar.gz \ file://libtool-fix.patch;patch=1 \ @@ -76,7 +76,7 @@ pkg_postinst_${PN} () { grep -q mail: /etc/passwd || \ adduser --disabled-password --home=${localstatedir}/mail --system \ --ingroup mail --no-create-home -g "Mail" mail - /etc/init.d/populate-volatile.sh + /etc/init.d/populate-volatile.sh update } CONFFILES_${PN} = "${sysconfdir}/p3scan/p3scan.conf" diff --git a/packages/postfix/postfix_2.0.20.bb b/packages/postfix/postfix_2.0.20.bb index 06e173a5c4..97bc253aff 100644 --- a/packages/postfix/postfix_2.0.20.bb +++ b/packages/postfix/postfix_2.0.20.bb @@ -1,7 +1,7 @@ SECTION = "console/network" DEPENDS = "virtual/db libpcre postfix-native" LICENSE = "IPL" -PR = "r9" +PR = "r10" SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \ file://${FILESDIR}/makedefs.patch;patch=1 \ @@ -64,7 +64,7 @@ pkg_postinst () { rm -f /var/tmp/main_cf.sh chmod 644 /etc/postfix/main.cf [ -d /var/spool/postfix ] && rmdir /var/spool/postfix - /etc/init.d/populate-volatile.sh + /etc/init.d/populate-volatile.sh update touch /etc/aliases newaliases update-alternatives --install sendmail sendmail ${sbindir}/sendmail.${PN} 40 -- cgit 1.2.3-korg