summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/postfix/files/install.patch (renamed from packages/postfix/postfix-2.0.20/install.patch)0
-rw-r--r--packages/postfix/files/makedefs.patch (renamed from packages/postfix/postfix-2.0.20/makedefs.patch)0
-rw-r--r--packages/postfix/postfix-native_2.0.20.bb2
-rw-r--r--packages/postfix/postfix-native_2.2.12.bb10
-rw-r--r--packages/postfix/postfix.inc81
-rw-r--r--packages/postfix/postfix_2.0.20.bb83
-rw-r--r--packages/postfix/postfix_2.2.12.bb1
7 files changed, 95 insertions, 82 deletions
diff --git a/packages/postfix/postfix-2.0.20/install.patch b/packages/postfix/files/install.patch
index baffcce0e8..baffcce0e8 100644
--- a/packages/postfix/postfix-2.0.20/install.patch
+++ b/packages/postfix/files/install.patch
diff --git a/packages/postfix/postfix-2.0.20/makedefs.patch b/packages/postfix/files/makedefs.patch
index 433b171e5a..433b171e5a 100644
--- a/packages/postfix/postfix-2.0.20/makedefs.patch
+++ b/packages/postfix/files/makedefs.patch
diff --git a/packages/postfix/postfix-native_2.0.20.bb b/packages/postfix/postfix-native_2.0.20.bb
index 0ba8c493ff..66ff65de4c 100644
--- a/packages/postfix/postfix-native_2.0.20.bb
+++ b/packages/postfix/postfix-native_2.0.20.bb
@@ -1,5 +1,5 @@
-SECTION = "console/network"
require postfix_${PV}.bb
+
inherit native
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/postfix-${PV}"
DEPENDS = "virtual/db-native libpcre-native"
diff --git a/packages/postfix/postfix-native_2.2.12.bb b/packages/postfix/postfix-native_2.2.12.bb
new file mode 100644
index 0000000000..66ff65de4c
--- /dev/null
+++ b/packages/postfix/postfix-native_2.2.12.bb
@@ -0,0 +1,10 @@
+require postfix_${PV}.bb
+
+inherit native
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/postfix-${PV}"
+DEPENDS = "virtual/db-native libpcre-native"
+export DIRS = "src/util src/global src/postconf"
+
+do_stage () {
+ install -m 0755 src/postconf/postconf ${STAGING_BINDIR}/
+}
diff --git a/packages/postfix/postfix.inc b/packages/postfix/postfix.inc
new file mode 100644
index 0000000000..0371f62957
--- /dev/null
+++ b/packages/postfix/postfix.inc
@@ -0,0 +1,81 @@
+SECTION = "console/network"
+DEPENDS = "virtual/db libpcre postfix-native"
+LICENSE = "IPL"
+
+SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \
+ file://${FILESDIR}/makedefs.patch;patch=1 \
+ file://${FILESDIR}/install.patch;patch=1 \
+ file://main.cf_2.0 \
+ file://volatiles \
+ file://postfix \
+ file://internal_recipient \
+ "
+
+S = "${WORKDIR}/postfix-${PV}"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "postfix"
+INITSCRIPT_PARAMS = "start 58 3 4 5 . stop 13 0 1 6 ."
+
+#FIXME: this is broken because the native build won't work on systems where
+# native bdb does not require libpthread. ARM doesn't require libpthread
+# because it uses an assembler mutex implementation.
+LIBBDB_EXTRA = "-lpthread"
+LIBBDB_EXTRA_arm = ""
+LIBBDB_EXTRA_armeb = ""
+
+export SYSLIBS = "-lpcre -ldb ${LIBBDB_EXTRA} -lnsl -lresolv ${LDFLAGS}"
+export EXPORT = "AUXLIBS='-lpcre' CCARGS='-DHAS_PCRE ${CFLAGS}' OPT='' DEBUG='-g'"
+export CC_append = " -DHAS_PCRE ${CFLAGS}"
+export EXTRA_OEMAKE = "-e"
+export POSTCONF = "${STAGING_BINDIR_NATIVE}/postconf"
+
+do_compile () {
+ unset CFLAGS CPPFLAGS CXXFLAGS
+ oe_runmake makefiles
+ oe_runmake
+}
+
+do_install () {
+ sh ./postfix-install 'install_root=${D}' -non-interactive
+ rm -rf ${D}${localstatedir}/spool/postfix
+ mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/sample-main.cf
+ install -d ${D}${localstatedir}/tmp
+ install -d ${D}${sysconfdir}/default/volatiles
+ install -d ${D}${sysconfdir}/init.d
+ install -m 755 ${WORKDIR}/main.cf_2.0 ${D}${localstatedir}/tmp/main_cf.sh
+ install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/01_postfix
+ install -m 755 ${WORKDIR}/postfix ${D}${sysconfdir}/init.d/postfix
+ install -m 644 ${WORKDIR}/internal_recipient ${D}${sysconfdir}/postfix/internal_recipient
+ mv ${D}${sbindir}/sendmail ${D}${sbindir}/sendmail.${PN}
+}
+
+pkg_postinst () {
+ update-alternatives --install ${sbindir}/sendmail sendmail sendmail.${PN} 40
+ grep postfix /etc/group || addgroup postfix
+ grep postdrop /etc/group || addgroup postdrop
+ grep vmail /etc/group || addgroup vmail
+ grep postfix /etc/passwd || adduser --disabled-password --home=/var/spool/postfix --ingroup postfix -g "Postfix" postfix
+ grep vmail /etc/passwd || adduser --disabled-password --home=/var/spool/vmail --ingroup vmail -g "Postfix" vmail
+ chgrp postdrop /usr/sbin/postqueue
+ chgrp postdrop /usr/sbin/postdrop
+ chmod g+s /usr/sbin/postqueue
+ chmod g+s /usr/sbin/postdrop
+ /var/tmp/main_cf.sh >/etc/postfix/main.cf
+ 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 update
+ touch /etc/aliases
+ newaliases
+}
+
+pkg_postrm () {
+ update-alternatives --remove sendmail sendmail.${PN}
+}
+
+# Exclude .debug directories from the main package
+FILES_${PN} = "${sysconfdir} ${localstatedir} ${bindir}/* ${sbindir}/* \
+ ${libexecdir}/postfix/*"
+FILES_${PN}-dbg += "${libexecdir}/postfix/.debug"
diff --git a/packages/postfix/postfix_2.0.20.bb b/packages/postfix/postfix_2.0.20.bb
index 44e1515f1c..8cafc344f2 100644
--- a/packages/postfix/postfix_2.0.20.bb
+++ b/packages/postfix/postfix_2.0.20.bb
@@ -1,82 +1,3 @@
-SECTION = "console/network"
-DEPENDS = "virtual/db libpcre postfix-native"
-LICENSE = "IPL"
-PR = "r12"
+require postfix.inc
-SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \
- file://${FILESDIR}/makedefs.patch;patch=1 \
- file://${FILESDIR}/install.patch;patch=1 \
- file://main.cf_2.0 \
- file://volatiles \
- file://postfix \
- file://internal_recipient \
- "
-
-S = "${WORKDIR}/postfix-${PV}"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "postfix"
-INITSCRIPT_PARAMS = "start 58 3 4 5 . stop 13 0 1 6 ."
-
-#FIXME: this is broken because the native build won't work on systems where
-# native bdb does not require libpthread. ARM doesn't require libpthread
-# because it uses an assembler mutex implementation.
-LIBBDB_EXTRA = "-lpthread"
-LIBBDB_EXTRA_arm = ""
-LIBBDB_EXTRA_armeb = ""
-
-export SYSLIBS = "-lpcre -ldb ${LIBBDB_EXTRA} -lnsl -lresolv ${LDFLAGS}"
-export EXPORT = "AUXLIBS='-lpcre' CCARGS='-DHAS_PCRE ${CFLAGS}' OPT='' DEBUG='-g'"
-export CC_append = " -DHAS_PCRE ${CFLAGS}"
-export EXTRA_OEMAKE = "-e"
-export POSTCONF = "${STAGING_BINDIR_NATIVE}/postconf"
-
-do_compile () {
- unset CFLAGS CPPFLAGS CXXFLAGS
- oe_runmake makefiles
- oe_runmake
-}
-
-do_install () {
- sh ./postfix-install 'install_root=${D}' -non-interactive
- rm -rf ${D}${localstatedir}/spool/postfix
- mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/sample-main.cf
- install -d ${D}${localstatedir}/tmp
- install -d ${D}${sysconfdir}/default/volatiles
- install -d ${D}${sysconfdir}/init.d
- install -m 755 ${WORKDIR}/main.cf_2.0 ${D}${localstatedir}/tmp/main_cf.sh
- install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/01_postfix
- install -m 755 ${WORKDIR}/postfix ${D}${sysconfdir}/init.d/postfix
- install -m 644 ${WORKDIR}/internal_recipient ${D}${sysconfdir}/postfix/internal_recipient
- mv ${D}${sbindir}/sendmail ${D}${sbindir}/sendmail.${PN}
-}
-
-pkg_postinst () {
- update-alternatives --install ${sbindir}/sendmail sendmail sendmail.${PN} 40
- grep postfix /etc/group || addgroup postfix
- grep postdrop /etc/group || addgroup postdrop
- grep vmail /etc/group || addgroup vmail
- grep postfix /etc/passwd || adduser --disabled-password --home=/var/spool/postfix --ingroup postfix -g "Postfix" postfix
- grep vmail /etc/passwd || adduser --disabled-password --home=/var/spool/vmail --ingroup vmail -g "Postfix" vmail
- chgrp postdrop /usr/sbin/postqueue
- chgrp postdrop /usr/sbin/postdrop
- chmod g+s /usr/sbin/postqueue
- chmod g+s /usr/sbin/postdrop
- /var/tmp/main_cf.sh >/etc/postfix/main.cf
- 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 update
- touch /etc/aliases
- newaliases
-}
-
-pkg_postrm () {
- update-alternatives --remove sendmail sendmail.${PN}
-}
-
-# Exclude .debug directories from the main package
-FILES_${PN} = "${sysconfdir} ${localstatedir} ${bindir}/* ${sbindir}/* \
- ${libexecdir}/postfix/*"
-FILES_${PN}-dbg += "${libexecdir}/postfix/.debug"
+PR = "r13"
diff --git a/packages/postfix/postfix_2.2.12.bb b/packages/postfix/postfix_2.2.12.bb
new file mode 100644
index 0000000000..3f1039a83d
--- /dev/null
+++ b/packages/postfix/postfix_2.2.12.bb
@@ -0,0 +1 @@
+require postfix.inc