diet-qmail: merged w/ diet-qmail-fix-qmail.install
authorTomas Zeman <tzeman@volny.cz>
Thu, 05 Jun 2008 16:10:49 +0200
changeset 28 4733b8aac58d
parent 27 d00722bb1ca2
child 29 bb8dbd2d57f5
diet-qmail: merged w/ diet-qmail-fix-qmail.install
diet-qmail-fix-qmail.install
diet-qmail.patch
series
--- a/diet-qmail-fix-qmail.install	Thu Jun 05 16:03:43 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-From 8397f25eee7131dee872101241029bd26c8f55ca Mon Sep 17 00:00:00 2001
-From: Tomas Zeman <tzeman@volny.cz>
-Date: Tue, 6 Nov 2007 14:24:18 +0100
-Subject: [PATCH] diet-qmail-1.03-1-i686: add qmail.install to repo
-
----
- source/dietlibc/diet-qmail/qmail.install |   82 ++++++++++++++++++++++++++++++
- 1 files changed, 82 insertions(+), 0 deletions(-)
- create mode 100644 source/dietlibc/diet-qmail/qmail.install
-
-diff --git a/source/dietlibc/diet-qmail/qmail.install b/source/dietlibc/diet-qmail/qmail.install
-new file mode 100644
-index 0000000..1fa4a33
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/qmail.install
-@@ -0,0 +1,82 @@
-+post_install() {
-+
-+  # add required groups
-+  if [ ! `grep qmail /etc/group` ]; then
-+    groupadd -g 2107 qmail &>/dev/null
-+  fi
-+
-+  if [ ! `grep nofiles /etc/group` ]; then
-+    groupadd -g  2108 nofiles &>/dev/null
-+  fi
-+
-+  # add required users
-+  id alias &>/dev/null || \
-+    useradd -u 7790 -g nofiles -d /var/qmail/alias -s /bin/false alias
-+
-+  id qmaild &>/dev/null || \
-+    useradd -u 7791 -g nofiles -d /var/qmail -s /bin/false qmaild
-+
-+  id qmaill &>/dev/null || \
-+    useradd -u 7792 -g nofiles -d /var/qmail -s /bin/false qmaill
-+
-+  id qmailp &>/dev/null || \
-+    useradd -u 7793 -g nofiles -d /var/qmail -s /bin/false qmailp
-+
-+  id qmailq &>/dev/null || \
-+    useradd -u 7794 -g qmail -d /var/qmail -s /bin/false qmailq
-+
-+  id qmailr &>/dev/null || \
-+    useradd -u 7795 -g qmail -d /var/qmail -s /bin/false qmailr
-+
-+  id qmails &>/dev/null || \
-+    useradd -u 7796 -g qmail -d /var/qmail -s /bin/false qmails
-+  
-+  # create FQDN file
-+  if ! [ -f /var/qmail/control/me ]; then
-+    /bin/hostname -f > /var/qmail/control/me
-+    chmod 644 /var/qmail/control/me
-+  fi
-+
-+  # create aliases
-+  for i in postmaster mailer-daemon root; do
-+    if ! [ -f ~alias/.qmail-${i} ]; then
-+      touch ~alias/.qmail-${i}
-+      chmod 644 ~alias/.qmail-${i}
-+    fi
-+  done
-+
-+  # create /var/qmail/queue
-+  echo "==> Setting up message queue directory (/var/qmail/queue)"
-+  /var/qmail/bin/queue-fix /var/qmail/queue &> /dev/null
-+
-+  cat << EOF
-+
-+Log out & back in (or source /etc/profile) before running qmail.
-+To setup qmail run:
-+  
-+  $ config-fast FQDN
-+replacing FQDN with your fully qualified domain.
-+Then :
-+$ ln -s /var/qmail/supervise/qmail-send /var/qmail/supervise/qmail-smtpd /service
-+In order to create SSL certificates run make_cert.sh (use -h for more options).
-+
-+EOF
-+}
-+
-+post_upgrade() {
-+  post_install $1
-+}
-+
-+pre_remove() {
-+  for user in alias qmail{d,l,p,q,r,s}; do
-+    userdel ${user} &> /dev/null
-+  done
-+  for group in nofiles qmail; do
-+    groupdel ${group} &> /dev/null
-+  done
-+}
-+
-+op=$1
-+shift
-+
-+$op $*
--- 
-1.5.3.4
-
--- a/diet-qmail.patch	Thu Jun 05 16:03:43 2008 +0200
+++ b/diet-qmail.patch	Thu Jun 05 16:10:49 2008 +0200
@@ -1,53 +1,4 @@
-From f3f9a0e61348706d763c41f2ac889425b964cf51 Mon Sep 17 00:00:00 2001
-From: Tomas Zeman <tzeman@volny.cz>
-Date: Sat, 3 Nov 2007 22:53:29 +0100
-Subject: [PATCH] diet-qmail-1.03-1-i686:
- * added
-
----
- source/dietlibc/diet-qmail/FrugalBuild             |  293 +++++
- source/dietlibc/diet-qmail/ext_todo-20030105.patch | 1238 ++++++++++++++++++++
- source/dietlibc/diet-qmail/make_cert.sh            |   57 +
- source/dietlibc/diet-qmail/pop3d_log_run           |   20 +
- source/dietlibc/diet-qmail/pop3d_run               |   33 +
- source/dietlibc/diet-qmail/qmail-1.03.errno.patch  |   47 +
- source/dietlibc/diet-qmail/qmail-dietlibc.patch    |   40 +
- source/dietlibc/diet-qmail/qmail-smtpd.spam.patch  |   74 ++
- source/dietlibc/diet-qmail/qmail.profile           |    5 +
- source/dietlibc/diet-qmail/qmail.rc                |  167 +++
- source/dietlibc/diet-qmail/qmailqueue-patch        |   72 ++
- .../diet-qmail/qregex-20060423-qmail.patch         |  688 +++++++++++
- .../dietlibc/diet-qmail/queue-fix-dietlibc.patch   |   18 +
- source/dietlibc/diet-qmail/queue-fix-errno.patch   |   14 +
- source/dietlibc/diet-qmail/rc                      |    7 +
- source/dietlibc/diet-qmail/send_log_run            |   20 +
- source/dietlibc/diet-qmail/send_run                |    8 +
- source/dietlibc/diet-qmail/smtpd_log_run           |   20 +
- source/dietlibc/diet-qmail/smtpd_run               |   45 +
- source/dietlibc/diet-qmail/tcp.pop3                |    6 +
- source/dietlibc/diet-qmail/tcp.smtp                |   81 ++
- 21 files changed, 2953 insertions(+), 0 deletions(-)
- create mode 100644 source/dietlibc/diet-qmail/FrugalBuild
- create mode 100644 source/dietlibc/diet-qmail/ext_todo-20030105.patch
- create mode 100644 source/dietlibc/diet-qmail/make_cert.sh
- create mode 100644 source/dietlibc/diet-qmail/pop3d_log_run
- create mode 100644 source/dietlibc/diet-qmail/pop3d_run
- create mode 100644 source/dietlibc/diet-qmail/qmail-1.03.errno.patch
- create mode 100644 source/dietlibc/diet-qmail/qmail-dietlibc.patch
- create mode 100644 source/dietlibc/diet-qmail/qmail-smtpd.spam.patch
- create mode 100644 source/dietlibc/diet-qmail/qmail.profile
- create mode 100644 source/dietlibc/diet-qmail/qmail.rc
- create mode 100644 source/dietlibc/diet-qmail/qmailqueue-patch
- create mode 100644 source/dietlibc/diet-qmail/qregex-20060423-qmail.patch
- create mode 100644 source/dietlibc/diet-qmail/queue-fix-dietlibc.patch
- create mode 100644 source/dietlibc/diet-qmail/queue-fix-errno.patch
- create mode 100644 source/dietlibc/diet-qmail/rc
- create mode 100644 source/dietlibc/diet-qmail/send_log_run
- create mode 100644 source/dietlibc/diet-qmail/send_run
- create mode 100644 source/dietlibc/diet-qmail/smtpd_log_run
- create mode 100644 source/dietlibc/diet-qmail/smtpd_run
- create mode 100644 source/dietlibc/diet-qmail/tcp.pop3
- create mode 100644 source/dietlibc/diet-qmail/tcp.smtp
+diet-qmail
 
 diff --git a/source/dietlibc/diet-qmail/FrugalBuild b/source/dietlibc/diet-qmail/FrugalBuild
 new file mode 100644
@@ -1899,6 +1850,94 @@
 +   if (!stralloc_cats(&rcptto,"T")) die_nomem();
 +   if (!stralloc_cats(&rcptto,addr.s)) die_nomem();
 +   if (!stralloc_0(&rcptto)) die_nomem();
+diff --git a/source/dietlibc/diet-qmail/qmail.install b/source/dietlibc/diet-qmail/qmail.install
+new file mode 100644
+index 0000000..1fa4a33
+--- /dev/null
++++ b/source/dietlibc/diet-qmail/qmail.install
+@@ -0,0 +1,82 @@
++post_install() {
++
++  # add required groups
++  if [ ! `grep qmail /etc/group` ]; then
++    groupadd -g 2107 qmail &>/dev/null
++  fi
++
++  if [ ! `grep nofiles /etc/group` ]; then
++    groupadd -g  2108 nofiles &>/dev/null
++  fi
++
++  # add required users
++  id alias &>/dev/null || \
++    useradd -u 7790 -g nofiles -d /var/qmail/alias -s /bin/false alias
++
++  id qmaild &>/dev/null || \
++    useradd -u 7791 -g nofiles -d /var/qmail -s /bin/false qmaild
++
++  id qmaill &>/dev/null || \
++    useradd -u 7792 -g nofiles -d /var/qmail -s /bin/false qmaill
++
++  id qmailp &>/dev/null || \
++    useradd -u 7793 -g nofiles -d /var/qmail -s /bin/false qmailp
++
++  id qmailq &>/dev/null || \
++    useradd -u 7794 -g qmail -d /var/qmail -s /bin/false qmailq
++
++  id qmailr &>/dev/null || \
++    useradd -u 7795 -g qmail -d /var/qmail -s /bin/false qmailr
++
++  id qmails &>/dev/null || \
++    useradd -u 7796 -g qmail -d /var/qmail -s /bin/false qmails
++  
++  # create FQDN file
++  if ! [ -f /var/qmail/control/me ]; then
++    /bin/hostname -f > /var/qmail/control/me
++    chmod 644 /var/qmail/control/me
++  fi
++
++  # create aliases
++  for i in postmaster mailer-daemon root; do
++    if ! [ -f ~alias/.qmail-${i} ]; then
++      touch ~alias/.qmail-${i}
++      chmod 644 ~alias/.qmail-${i}
++    fi
++  done
++
++  # create /var/qmail/queue
++  echo "==> Setting up message queue directory (/var/qmail/queue)"
++  /var/qmail/bin/queue-fix /var/qmail/queue &> /dev/null
++
++  cat << EOF
++
++Log out & back in (or source /etc/profile) before running qmail.
++To setup qmail run:
++  
++  $ config-fast FQDN
++replacing FQDN with your fully qualified domain.
++Then :
++$ ln -s /var/qmail/supervise/qmail-send /var/qmail/supervise/qmail-smtpd /service
++In order to create SSL certificates run make_cert.sh (use -h for more options).
++
++EOF
++}
++
++post_upgrade() {
++  post_install $1
++}
++
++pre_remove() {
++  for user in alias qmail{d,l,p,q,r,s}; do
++    userdel ${user} &> /dev/null
++  done
++  for group in nofiles qmail; do
++    groupdel ${group} &> /dev/null
++  done
++}
++
++op=$1
++shift
++
++$op $*
 diff --git a/source/dietlibc/diet-qmail/qmail.profile b/source/dietlibc/diet-qmail/qmail.profile
 new file mode 100644
 index 0000000..3b5fcd0
@@ -3128,6 +3167,3 @@
 +# but not allowed to relay
 +# RBL lookups are performed
 +:allow
--- 
-1.5.3.4
-
--- a/series	Thu Jun 05 16:03:43 2008 +0200
+++ b/series	Thu Jun 05 16:10:49 2008 +0200
@@ -22,7 +22,6 @@
 diet-openssl.patch
 diet-ucspi-ssl.patch
 diet-qmail.patch
-diet-qmail-fix-qmail.install
 diet-qmail-autoresponder.patch
 diet-ucspi-proxy.patch
 embutils.patch