diet-qmail.patch
changeset 98 ee6165a0b4ed
parent 28 4733b8aac58d
equal deleted inserted replaced
97:f232929781d6 98:ee6165a0b4ed
     1 diet-qmail
     1 diet-qmail
     2 
     2 
     3 diff --git a/source/dietlibc/diet-qmail/FrugalBuild b/source/dietlibc/diet-qmail/FrugalBuild
     3 diff -r 2be82bdba73b source/dietlibc/diet-qmail/FrugalBuild
     4 new file mode 100644
     4 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5 index 0000000..c973246
     5 +++ b/source/dietlibc/diet-qmail/FrugalBuild	Wed Feb 15 15:10:10 2012 +0100
     6 --- /dev/null
       
     7 +++ b/source/dietlibc/diet-qmail/FrugalBuild
       
     8 @@ -0,0 +1,293 @@
     6 @@ -0,0 +1,293 @@
     9 +# Patched qmail:
     7 +# Patched qmail:
    10 +#	errno
     8 +#	errno
    11 +#	ext_todo
     9 +#	ext_todo
    12 +#	qregex
    10 +#	qregex
    20 +
    18 +
    21 +branch=diet
    19 +branch=diet
    22 +pkgorig=qmail
    20 +pkgorig=qmail
    23 +pkgname=$branch-$pkgorig
    21 +pkgname=$branch-$pkgorig
    24 +pkgver=1.03
    22 +pkgver=1.03
    25 +pkgrel=1
    23 +pkgrel=2
    26 +pkgdesc="A secure, reliable, efficient, SMTP/POP3 server."
    24 +pkgdesc="A secure, reliable, efficient, SMTP/POP3 server."
    27 +url="http://cr.yp.to/qmail.html"
    25 +url="http://cr.yp.to/qmail.html"
    28 +depends=('daemontools' 'ucspi-tcp' 'openssl')
    26 +depends=('daemontools' 'ucspi-tcp' 'openssl')
    29 +makedepends=('dietlibc')
    27 +makedepends=('dietlibc')
    30 +backup=(var/qmail/supervise/qmail-pop3d/run \
    28 +backup=(var/qmail/supervise/qmail-pop3d/run \
   297 + 
   295 + 
   298 +  # remove groups & users
   296 +  # remove groups & users
   299 +  post_build_qmail || Fdie
   297 +  post_build_qmail || Fdie
   300 +}
   298 +}
   301 +
   299 +
   302 diff --git a/source/dietlibc/diet-qmail/ext_todo-20030105.patch b/source/dietlibc/diet-qmail/ext_todo-20030105.patch
   300 diff -r 2be82bdba73b source/dietlibc/diet-qmail/ext_todo-20030105.patch
   303 new file mode 100644
   301 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   304 index 0000000..466fb4d
   302 +++ b/source/dietlibc/diet-qmail/ext_todo-20030105.patch	Wed Feb 15 15:10:10 2012 +0100
   305 --- /dev/null
       
   306 +++ b/source/dietlibc/diet-qmail/ext_todo-20030105.patch
       
   307 @@ -0,0 +1,1238 @@
   303 @@ -0,0 +1,1238 @@
   308 +diff -uN qmail-1.03/EXTTODO qmail-exttodo/EXTTODO
   304 +diff -uN qmail-1.03/EXTTODO qmail-exttodo/EXTTODO
   309 +--- qmail-1.03/EXTTODO	Thu Jan  1 01:00:00 1970
   305 +--- qmail-1.03/EXTTODO	Thu Jan  1 01:00:00 1970
   310 ++++ qmail-exttodo/EXTTODO	Sun Jan  5 22:12:01 2003
   306 ++++ qmail-exttodo/EXTTODO	Sun Jan  5 22:12:01 2003
   311 +@@ -0,0 +1,114 @@
   307 +@@ -0,0 +1,114 @@
  1541 ++    }
  1537 ++    }
  1542 ++  }
  1538 ++  }
  1543 ++  /* NOTREACHED */
  1539 ++  /* NOTREACHED */
  1544 ++}
  1540 ++}
  1545 ++
  1541 ++
  1546 diff --git a/source/dietlibc/diet-qmail/make_cert.sh b/source/dietlibc/diet-qmail/make_cert.sh
  1542 diff -r 2be82bdba73b source/dietlibc/diet-qmail/make_cert.sh
  1547 new file mode 100644
  1543 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  1548 index 0000000..8b17499
  1544 +++ b/source/dietlibc/diet-qmail/make_cert.sh	Wed Feb 15 15:10:10 2012 +0100
  1549 --- /dev/null
       
  1550 +++ b/source/dietlibc/diet-qmail/make_cert.sh
       
  1551 @@ -0,0 +1,57 @@
  1545 @@ -0,0 +1,57 @@
  1552 +#!/bin/sh
  1546 +#!/bin/sh
  1553 +#
  1547 +#
  1554 +# This script creates ssl certificates for
  1548 +# This script creates ssl certificates for
  1555 +# use with qmail.
  1549 +# use with qmail.
  1604 +  *)
  1598 +  *)
  1605 +    cert
  1599 +    cert
  1606 +  ;;
  1600 +  ;;
  1607 +esac
  1601 +esac
  1608 +
  1602 +
  1609 diff --git a/source/dietlibc/diet-qmail/pop3d_log_run b/source/dietlibc/diet-qmail/pop3d_log_run
  1603 diff -r 2be82bdba73b source/dietlibc/diet-qmail/pop3d_log_run
  1610 new file mode 100644
  1604 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  1611 index 0000000..941cde1
  1605 +++ b/source/dietlibc/diet-qmail/pop3d_log_run	Wed Feb 15 15:10:10 2012 +0100
  1612 --- /dev/null
       
  1613 +++ b/source/dietlibc/diet-qmail/pop3d_log_run
       
  1614 @@ -0,0 +1,20 @@
  1606 @@ -0,0 +1,20 @@
  1615 +#!/bin/sh
  1607 +#!/bin/sh
  1616 +# 
  1608 +# 
  1617 +# Edit this file to match your setup.
  1609 +# Edit this file to match your setup.
  1618 +# NOTE: This file is automatically backed-up by pacman, 
  1610 +# NOTE: This file is automatically backed-up by pacman, 
  1630 +
  1622 +
  1631 +exec /usr/bin/setuidgid qmaill \
  1623 +exec /usr/bin/setuidgid qmaill \
  1632 +  /usr/bin/multilog t \
  1624 +  /usr/bin/multilog t \
  1633 +  n${LOGS} s${LOG_SIZE} \
  1625 +  n${LOGS} s${LOG_SIZE} \
  1634 +  /var/log/qmail/pop3d 2>&1
  1626 +  /var/log/qmail/pop3d 2>&1
  1635 diff --git a/source/dietlibc/diet-qmail/pop3d_run b/source/dietlibc/diet-qmail/pop3d_run
  1627 diff -r 2be82bdba73b source/dietlibc/diet-qmail/pop3d_run
  1636 new file mode 100644
  1628 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  1637 index 0000000..a61f0cd
  1629 +++ b/source/dietlibc/diet-qmail/pop3d_run	Wed Feb 15 15:10:10 2012 +0100
  1638 --- /dev/null
       
  1639 +++ b/source/dietlibc/diet-qmail/pop3d_run
       
  1640 @@ -0,0 +1,33 @@
  1630 @@ -0,0 +1,33 @@
  1641 +#!/bin/sh
  1631 +#!/bin/sh
  1642 +#
  1632 +#
  1643 +# Edit this file to match your setup.
  1633 +# Edit this file to match your setup.
  1644 +# NOTE: This file is automatically backed-up by pacman, 
  1634 +# NOTE: This file is automatically backed-up by pacman, 
  1669 +exec /usr/bin/softlimit -m $MAX_MEM \
  1659 +exec /usr/bin/softlimit -m $MAX_MEM \
  1670 +  /usr/bin/tcpserver -H -l $LOCAL \
  1660 +  /usr/bin/tcpserver -H -l $LOCAL \
  1671 +  -v -x $TCP_CDB \
  1661 +  -v -x $TCP_CDB \
  1672 +  -c $MAX_CON -R 0 $PORT \
  1662 +  -c $MAX_CON -R 0 $PORT \
  1673 +  $POPUP $LOCAL $PASSPROG $POP3D Maildir 2>&1
  1663 +  $POPUP $LOCAL $PASSPROG $POP3D Maildir 2>&1
  1674 diff --git a/source/dietlibc/diet-qmail/qmail-1.03.errno.patch b/source/dietlibc/diet-qmail/qmail-1.03.errno.patch
  1664 diff -r 2be82bdba73b source/dietlibc/diet-qmail/qmail-1.03.errno.patch
  1675 new file mode 100644
  1665 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  1676 index 0000000..75e0b7b
  1666 +++ b/source/dietlibc/diet-qmail/qmail-1.03.errno.patch	Wed Feb 15 15:10:10 2012 +0100
  1677 --- /dev/null
       
  1678 +++ b/source/dietlibc/diet-qmail/qmail-1.03.errno.patch
       
  1679 @@ -0,0 +1,47 @@
  1667 @@ -0,0 +1,47 @@
  1680 +diff -u qmail-1.03.old/cdb_seek.c qmail-1.03/cdb_seek.c
  1668 +diff -u qmail-1.03.old/cdb_seek.c qmail-1.03/cdb_seek.c
  1681 +--- qmail-1.03.old/cdb_seek.c	1998-06-15 05:52:55.000000000 -0500
  1669 +--- qmail-1.03.old/cdb_seek.c	1998-06-15 05:52:55.000000000 -0500
  1682 ++++ qmail-1.03/cdb_seek.c	2003-01-08 15:55:53.000000000 -0600
  1670 ++++ qmail-1.03/cdb_seek.c	2003-01-08 15:55:53.000000000 -0600
  1683 +@@ -1,6 +1,5 @@
  1671 +@@ -1,6 +1,5 @@
  1722 +-extern int errno;
  1710 +-extern int errno;
  1723 ++#include <errno.h>
  1711 ++#include <errno.h>
  1724 + 
  1712 + 
  1725 + extern int error_intr;
  1713 + extern int error_intr;
  1726 + extern int error_nomem;
  1714 + extern int error_nomem;
  1727 diff --git a/source/dietlibc/diet-qmail/qmail-dietlibc.patch b/source/dietlibc/diet-qmail/qmail-dietlibc.patch
  1715 diff -r 2be82bdba73b source/dietlibc/diet-qmail/qmail-dietlibc.patch
  1728 new file mode 100644
  1716 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  1729 index 0000000..52e404c
  1717 +++ b/source/dietlibc/diet-qmail/qmail-dietlibc.patch	Wed Feb 15 15:10:10 2012 +0100
  1730 --- /dev/null
       
  1731 +++ b/source/dietlibc/diet-qmail/qmail-dietlibc.patch
       
  1732 @@ -0,0 +1,40 @@
  1718 @@ -0,0 +1,40 @@
  1733 +dietlibc compile
  1719 +dietlibc compile
  1734 +
  1720 +
  1735 +diff -r df48dd6b95fa conf-cc
  1721 +diff -r df48dd6b95fa conf-cc
  1736 +--- a/conf-cc	Thu Nov 01 16:30:40 2007 +0100
  1722 +--- a/conf-cc	Thu Nov 01 16:30:40 2007 +0100
  1768 + #endif
  1754 + #endif
  1769 +-#include "readwrite.h"
  1755 +-#include "readwrite.h"
  1770 + #include "stralloc.h"
  1756 + #include "stralloc.h"
  1771 + #include "substdio.h"
  1757 + #include "substdio.h"
  1772 + #include "subfd.h"
  1758 + #include "subfd.h"
  1773 diff --git a/source/dietlibc/diet-qmail/qmail-smtpd.spam.patch b/source/dietlibc/diet-qmail/qmail-smtpd.spam.patch
  1759 diff -r 2be82bdba73b source/dietlibc/diet-qmail/qmail-smtpd.spam.patch
  1774 new file mode 100644
  1760 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  1775 index 0000000..5ef6b6e
  1761 +++ b/source/dietlibc/diet-qmail/qmail-smtpd.spam.patch	Wed Feb 15 15:10:10 2012 +0100
  1776 --- /dev/null
       
  1777 +++ b/source/dietlibc/diet-qmail/qmail-smtpd.spam.patch
       
  1778 @@ -0,0 +1,74 @@
  1762 @@ -0,0 +1,74 @@
  1779 +stika.net antispam
  1763 +stika.net antispam
  1780 +
  1764 +
  1781 +diff -r 72430e923db2 qmail-smtpd.c
  1765 +diff -r 72430e923db2 qmail-smtpd.c
  1782 +--- a/qmail-smtpd.c	Thu Nov 01 16:46:06 2007 +0100
  1766 +--- a/qmail-smtpd.c	Thu Nov 01 16:46:06 2007 +0100
  1848 +     if (!addrallowed()) { err_nogateway(); return; }
  1832 +     if (!addrallowed()) { err_nogateway(); return; }
  1849 ++  if (!(addrallowed() || senderallowed)) { err_nogateway(); return; }	/* 20021121 tz - our anti-spam */
  1833 ++  if (!(addrallowed() || senderallowed)) { err_nogateway(); return; }	/* 20021121 tz - our anti-spam */
  1850 +   if (!stralloc_cats(&rcptto,"T")) die_nomem();
  1834 +   if (!stralloc_cats(&rcptto,"T")) die_nomem();
  1851 +   if (!stralloc_cats(&rcptto,addr.s)) die_nomem();
  1835 +   if (!stralloc_cats(&rcptto,addr.s)) die_nomem();
  1852 +   if (!stralloc_0(&rcptto)) die_nomem();
  1836 +   if (!stralloc_0(&rcptto)) die_nomem();
  1853 diff --git a/source/dietlibc/diet-qmail/qmail.install b/source/dietlibc/diet-qmail/qmail.install
  1837 diff -r 2be82bdba73b source/dietlibc/diet-qmail/qmail.install
  1854 new file mode 100644
  1838 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  1855 index 0000000..1fa4a33
  1839 +++ b/source/dietlibc/diet-qmail/qmail.install	Wed Feb 15 15:10:10 2012 +0100
  1856 --- /dev/null
       
  1857 +++ b/source/dietlibc/diet-qmail/qmail.install
       
  1858 @@ -0,0 +1,82 @@
  1840 @@ -0,0 +1,82 @@
  1859 +post_install() {
  1841 +post_install() {
  1860 +
  1842 +
  1861 +  # add required groups
  1843 +  # add required groups
  1862 +  if [ ! `grep qmail /etc/group` ]; then
  1844 +  if [ ! `grep qmail /etc/group` ]; then
  1936 +
  1918 +
  1937 +op=$1
  1919 +op=$1
  1938 +shift
  1920 +shift
  1939 +
  1921 +
  1940 +$op $*
  1922 +$op $*
  1941 diff --git a/source/dietlibc/diet-qmail/qmail.profile b/source/dietlibc/diet-qmail/qmail.profile
  1923 diff -r 2be82bdba73b source/dietlibc/diet-qmail/qmail.profile
  1942 new file mode 100644
  1924 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  1943 index 0000000..3b5fcd0
  1925 +++ b/source/dietlibc/diet-qmail/qmail.profile	Wed Feb 15 15:10:10 2012 +0100
  1944 --- /dev/null
       
  1945 +++ b/source/dietlibc/diet-qmail/qmail.profile
       
  1946 @@ -0,0 +1,5 @@
  1926 @@ -0,0 +1,5 @@
  1947 +#!/bin/sh
  1927 +#!/bin/sh
  1948 +
  1928 +
  1949 +export QMAILDIR=/var/qmail
  1929 +export QMAILDIR=/var/qmail
  1950 +export PATH=$PATH:$QMAILDIR/bin
  1930 +export PATH=$PATH:$QMAILDIR/bin
  1951 +export MANPATH=$MANPATH:$QMAILDIR/man
  1931 +export MANPATH=$MANPATH:$QMAILDIR/man
  1952 diff --git a/source/dietlibc/diet-qmail/qmail.rc b/source/dietlibc/diet-qmail/qmail.rc
  1932 diff -r 2be82bdba73b source/dietlibc/diet-qmail/qmail.rc
  1953 new file mode 100644
  1933 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  1954 index 0000000..45e716e
  1934 +++ b/source/dietlibc/diet-qmail/qmail.rc	Wed Feb 15 15:10:10 2012 +0100
  1955 --- /dev/null
       
  1956 +++ b/source/dietlibc/diet-qmail/qmail.rc
       
  1957 @@ -0,0 +1,167 @@
  1935 @@ -0,0 +1,167 @@
  1958 +#!/bin/sh
  1936 +#!/bin/sh
  1959 +#
  1937 +#
  1960 +# qmailctl script (based on lifewithqmail)
  1938 +# qmailctl script (based on lifewithqmail)
  1961 +# modified for ArchLinux
  1939 +# modified for ArchLinux
  2120 +    echo "Usage: $0 {start|stop|restart|doqueue|flush|reload|stat|pause|cont|cdb|queue|help}"
  2098 +    echo "Usage: $0 {start|stop|restart|doqueue|flush|reload|stat|pause|cont|cdb|queue|help}"
  2121 +    exit 1
  2099 +    exit 1
  2122 +    ;;
  2100 +    ;;
  2123 +esac
  2101 +esac
  2124 +exit 0
  2102 +exit 0
  2125 diff --git a/source/dietlibc/diet-qmail/qmailqueue-patch b/source/dietlibc/diet-qmail/qmailqueue-patch
  2103 diff -r 2be82bdba73b source/dietlibc/diet-qmail/qmailqueue-patch
  2126 new file mode 100644
  2104 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  2127 index 0000000..ec304b6
  2105 +++ b/source/dietlibc/diet-qmail/qmailqueue-patch	Wed Feb 15 15:10:10 2012 +0100
  2128 --- /dev/null
       
  2129 +++ b/source/dietlibc/diet-qmail/qmailqueue-patch
       
  2130 @@ -0,0 +1,72 @@
  2106 @@ -0,0 +1,72 @@
  2131 +From: Bruce Guenter <bguenter-djb-qmail@qcc.sk.ca>
  2107 +From: Bruce Guenter <bguenter-djb-qmail@qcc.sk.ca>
  2132 +To: qmail@list.cr.yp.to
  2108 +To: qmail@list.cr.yp.to
  2133 +Subject: QMAILQUEUE patch for qmail-1.03
  2109 +Subject: QMAILQUEUE patch for qmail-1.03
  2134 +Date: Mon, 25 Jan 1999 15:37:21 -0600
  2110 +Date: Mon, 25 Jan 1999 15:37:21 -0600
  2198 ++  setup_qqargs();
  2174 ++  setup_qqargs();
  2199 + 
  2175 + 
  2200 +   if (pipe(pim) == -1) return -1;
  2176 +   if (pipe(pim) == -1) return -1;
  2201 +   if (pipe(pie) == -1) { close(pim[0]); close(pim[1]); return -1; }
  2177 +   if (pipe(pie) == -1) { close(pim[0]); close(pim[1]); return -1; }
  2202 +
  2178 +
  2203 diff --git a/source/dietlibc/diet-qmail/qregex-20060423-qmail.patch b/source/dietlibc/diet-qmail/qregex-20060423-qmail.patch
  2179 diff -r 2be82bdba73b source/dietlibc/diet-qmail/qregex-20060423-qmail.patch
  2204 new file mode 100644
  2180 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  2205 index 0000000..6d08258
  2181 +++ b/source/dietlibc/diet-qmail/qregex-20060423-qmail.patch	Wed Feb 15 15:10:10 2012 +0100
  2206 --- /dev/null
       
  2207 +++ b/source/dietlibc/diet-qmail/qregex-20060423-qmail.patch
       
  2208 @@ -0,0 +1,688 @@
  2182 @@ -0,0 +1,688 @@
  2209 +Fixed qregex-20060423 (pristine is against netqmail)
  2183 +Fixed qregex-20060423 (pristine is against netqmail)
  2210 +
  2184 +
  2211 +diff -r 1510847ae5bf Makefile
  2185 +diff -r 1510847ae5bf Makefile
  2212 +--- a/Makefile	Thu Nov 01 16:23:16 2007 +0100
  2186 +--- a/Makefile	Thu Nov 01 16:23:16 2007 +0100
  2892 ++/* simple header file for the matchregex prototype */
  2866 ++/* simple header file for the matchregex prototype */
  2893 ++#ifndef _QREGEX_H_
  2867 ++#ifndef _QREGEX_H_
  2894 ++#define _QREGEX_H_
  2868 ++#define _QREGEX_H_
  2895 ++int matchregex(char *text, char *regex);
  2869 ++int matchregex(char *text, char *regex);
  2896 ++#endif
  2870 ++#endif
  2897 diff --git a/source/dietlibc/diet-qmail/queue-fix-dietlibc.patch b/source/dietlibc/diet-qmail/queue-fix-dietlibc.patch
  2871 diff -r 2be82bdba73b source/dietlibc/diet-qmail/queue-fix-dietlibc.patch
  2898 new file mode 100644
  2872 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  2899 index 0000000..6d967ed
  2873 +++ b/source/dietlibc/diet-qmail/queue-fix-dietlibc.patch	Wed Feb 15 15:10:10 2012 +0100
  2900 --- /dev/null
       
  2901 +++ b/source/dietlibc/diet-qmail/queue-fix-dietlibc.patch
       
  2902 @@ -0,0 +1,18 @@
  2874 @@ -0,0 +1,18 @@
  2903 +Compile with dietlibc
  2875 +Compile with dietlibc
  2904 +
  2876 +
  2905 +diff -r 6becbe0d87fa conf-cc
  2877 +diff -r 6becbe0d87fa conf-cc
  2906 +--- a/conf-cc	Thu Nov 01 15:04:39 2007 +0100
  2878 +--- a/conf-cc	Thu Nov 01 15:04:39 2007 +0100
  2916 +@@ -1,3 +1,3 @@ gcc -s
  2888 +@@ -1,3 +1,3 @@ gcc -s
  2917 +-gcc -s
  2889 +-gcc -s
  2918 ++diet gcc -s -static
  2890 ++diet gcc -s -static
  2919 + 
  2891 + 
  2920 + This will be used to link .o files into an executable.
  2892 + This will be used to link .o files into an executable.
  2921 diff --git a/source/dietlibc/diet-qmail/queue-fix-errno.patch b/source/dietlibc/diet-qmail/queue-fix-errno.patch
  2893 diff -r 2be82bdba73b source/dietlibc/diet-qmail/queue-fix-errno.patch
  2922 new file mode 100644
  2894 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  2923 index 0000000..72f9fcd
  2895 +++ b/source/dietlibc/diet-qmail/queue-fix-errno.patch	Wed Feb 15 15:10:10 2012 +0100
  2924 --- /dev/null
       
  2925 +++ b/source/dietlibc/diet-qmail/queue-fix-errno.patch
       
  2926 @@ -0,0 +1,14 @@
  2896 @@ -0,0 +1,14 @@
  2927 +errno fix
  2897 +errno fix
  2928 +
  2898 +
  2929 +diff -r c045670f36e9 error.h
  2899 +diff -r c045670f36e9 error.h
  2930 +--- a/error.h	Thu Nov 01 14:46:11 2007 +0100
  2900 +--- a/error.h	Thu Nov 01 14:46:11 2007 +0100
  2936 +-extern int errno;
  2906 +-extern int errno;
  2937 ++#include <errno.h>
  2907 ++#include <errno.h>
  2938 + 
  2908 + 
  2939 + extern int error_intr;
  2909 + extern int error_intr;
  2940 + extern int error_nomem;
  2910 + extern int error_nomem;
  2941 diff --git a/source/dietlibc/diet-qmail/rc b/source/dietlibc/diet-qmail/rc
  2911 diff -r 2be82bdba73b source/dietlibc/diet-qmail/rc
  2942 new file mode 100644
  2912 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  2943 index 0000000..0f82f9e
  2913 +++ b/source/dietlibc/diet-qmail/rc	Wed Feb 15 15:10:10 2012 +0100
  2944 --- /dev/null
       
  2945 +++ b/source/dietlibc/diet-qmail/rc
       
  2946 @@ -0,0 +1,7 @@
  2914 @@ -0,0 +1,7 @@
  2947 +#!/bin/sh
  2915 +#!/bin/sh
  2948 +#
  2916 +#
  2949 +# Using stdout for logging
  2917 +# Using stdout for logging
  2950 +# Using control/defaultdelivery from qmail-local to deliver messages by default
  2918 +# Using control/defaultdelivery from qmail-local to deliver messages by default
  2951 +#
  2919 +#
  2952 +exec env - PATH="/var/qmail/bin:$PATH" \
  2920 +exec env - PATH="/var/qmail/bin:$PATH" \
  2953 +  qmail-start "`cat /var/qmail/control/defaultdelivery`"
  2921 +  qmail-start "`cat /var/qmail/control/defaultdelivery`"
  2954 diff --git a/source/dietlibc/diet-qmail/send_log_run b/source/dietlibc/diet-qmail/send_log_run
  2922 diff -r 2be82bdba73b source/dietlibc/diet-qmail/send_log_run
  2955 new file mode 100644
  2923 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  2956 index 0000000..0c4fd21
  2924 +++ b/source/dietlibc/diet-qmail/send_log_run	Wed Feb 15 15:10:10 2012 +0100
  2957 --- /dev/null
       
  2958 +++ b/source/dietlibc/diet-qmail/send_log_run
       
  2959 @@ -0,0 +1,20 @@
  2925 @@ -0,0 +1,20 @@
  2960 +#!/bin/sh
  2926 +#!/bin/sh
  2961 +# 
  2927 +# 
  2962 +# Edit this file to match your setup.
  2928 +# Edit this file to match your setup.
  2963 +# NOTE: This file is automatically backed-up by pacman, 
  2929 +# NOTE: This file is automatically backed-up by pacman, 
  2975 +
  2941 +
  2976 +exec /usr/bin/setuidgid qmaill \
  2942 +exec /usr/bin/setuidgid qmaill \
  2977 +  /usr/bin/multilog t \
  2943 +  /usr/bin/multilog t \
  2978 +  n${LOGS} s${LOG_SIZE} \
  2944 +  n${LOGS} s${LOG_SIZE} \
  2979 +  /var/log/qmail/send 2>&1
  2945 +  /var/log/qmail/send 2>&1
  2980 diff --git a/source/dietlibc/diet-qmail/send_run b/source/dietlibc/diet-qmail/send_run
  2946 diff -r 2be82bdba73b source/dietlibc/diet-qmail/send_run
  2981 new file mode 100644
  2947 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  2982 index 0000000..1724b2c
  2948 +++ b/source/dietlibc/diet-qmail/send_run	Wed Feb 15 15:10:10 2012 +0100
  2983 --- /dev/null
       
  2984 +++ b/source/dietlibc/diet-qmail/send_run
       
  2985 @@ -0,0 +1,8 @@
  2949 @@ -0,0 +1,8 @@
  2986 +#!/bin/sh
  2950 +#!/bin/sh
  2987 +#
  2951 +#
  2988 +# Edit this file to match your setup.
  2952 +# Edit this file to match your setup.
  2989 +# NOTE: This file is automatically backed-up by pacman, 
  2953 +# NOTE: This file is automatically backed-up by pacman, 
  2990 +# during updates
  2954 +# during updates
  2991 +#
  2955 +#
  2992 +
  2956 +
  2993 +exec /var/qmail/rc
  2957 +exec /var/qmail/rc
  2994 diff --git a/source/dietlibc/diet-qmail/smtpd_log_run b/source/dietlibc/diet-qmail/smtpd_log_run
  2958 diff -r 2be82bdba73b source/dietlibc/diet-qmail/smtpd_log_run
  2995 new file mode 100644
  2959 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  2996 index 0000000..68027b6
  2960 +++ b/source/dietlibc/diet-qmail/smtpd_log_run	Wed Feb 15 15:10:10 2012 +0100
  2997 --- /dev/null
       
  2998 +++ b/source/dietlibc/diet-qmail/smtpd_log_run
       
  2999 @@ -0,0 +1,20 @@
  2961 @@ -0,0 +1,20 @@
  3000 +#!/bin/sh
  2962 +#!/bin/sh
  3001 +#
  2963 +#
  3002 +# Edit this file to match your setup.
  2964 +# Edit this file to match your setup.
  3003 +# NOTE: This file is automatically backed-up by pacman, 
  2965 +# NOTE: This file is automatically backed-up by pacman, 
  3015 +
  2977 +
  3016 +exec /usr/bin/setuidgid qmaill \
  2978 +exec /usr/bin/setuidgid qmaill \
  3017 +  /usr/bin/multilog t \
  2979 +  /usr/bin/multilog t \
  3018 +  n${LOGS} s${LOG_SIZE} \
  2980 +  n${LOGS} s${LOG_SIZE} \
  3019 +  /var/log/qmail/smtpd 2>&1
  2981 +  /var/log/qmail/smtpd 2>&1
  3020 diff --git a/source/dietlibc/diet-qmail/smtpd_run b/source/dietlibc/diet-qmail/smtpd_run
  2982 diff -r 2be82bdba73b source/dietlibc/diet-qmail/smtpd_run
  3021 new file mode 100644
  2983 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  3022 index 0000000..ffd4451
  2984 +++ b/source/dietlibc/diet-qmail/smtpd_run	Wed Feb 15 15:10:10 2012 +0100
  3023 --- /dev/null
       
  3024 +++ b/source/dietlibc/diet-qmail/smtpd_run
       
  3025 @@ -0,0 +1,45 @@
  2985 @@ -0,0 +1,45 @@
  3026 +#!/bin/sh
  2986 +#!/bin/sh
  3027 +# 
  2987 +# 
  3028 +# Edit this file to match your setup.
  2988 +# Edit this file to match your setup.
  3029 +# NOTE: This file is automatically backed-up by pacman, 
  2989 +# NOTE: This file is automatically backed-up by pacman, 
  3066 +  -c $MAX_CON -R 0 $PORT \
  3026 +  -c $MAX_CON -R 0 $PORT \
  3067 +  -u $QMAILUID -g $NOFILESGID \
  3027 +  -u $QMAILUID -g $NOFILESGID \
  3068 +  /usr/bin/rblsmtpd -b -C \
  3028 +  /usr/bin/rblsmtpd -b -C \
  3069 +  -r $RELAY_DENIED -t 5 \
  3029 +  -r $RELAY_DENIED -t 5 \
  3070 +  $SMTPD $PASSPROG /bin/true 2>&1
  3030 +  $SMTPD $PASSPROG /bin/true 2>&1
  3071 diff --git a/source/dietlibc/diet-qmail/tcp.pop3 b/source/dietlibc/diet-qmail/tcp.pop3
  3031 diff -r 2be82bdba73b source/dietlibc/diet-qmail/tcp.pop3
  3072 new file mode 100644
  3032 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  3073 index 0000000..4437128
  3033 +++ b/source/dietlibc/diet-qmail/tcp.pop3	Wed Feb 15 15:10:10 2012 +0100
  3074 --- /dev/null
       
  3075 +++ b/source/dietlibc/diet-qmail/tcp.pop3
       
  3076 @@ -0,0 +1,6 @@
  3034 @@ -0,0 +1,6 @@
  3077 +# to update the database after changing this file, run:
  3035 +# to update the database after changing this file, run:
  3078 +# /etc/rc.d/qmail cdb
  3036 +# /etc/rc.d/qmail cdb
  3079 +# Allow any client to connect to us via POP3
  3037 +# Allow any client to connect to us via POP3
  3080 +# If people are abusing POP3 such as denial-of-service on POP3,
  3038 +# If people are abusing POP3 such as denial-of-service on POP3,
  3081 +# you can add their ips here to block them out
  3039 +# you can add their ips here to block them out
  3082 +:allow
  3040 +:allow
  3083 diff --git a/source/dietlibc/diet-qmail/tcp.smtp b/source/dietlibc/diet-qmail/tcp.smtp
  3041 diff -r 2be82bdba73b source/dietlibc/diet-qmail/tcp.smtp
  3084 new file mode 100644
  3042 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  3085 index 0000000..a5faa17
  3043 +++ b/source/dietlibc/diet-qmail/tcp.smtp	Wed Feb 15 15:10:10 2012 +0100
  3086 --- /dev/null
       
  3087 +++ b/source/dietlibc/diet-qmail/tcp.smtp
       
  3088 @@ -0,0 +1,81 @@
  3044 @@ -0,0 +1,81 @@
  3089 +#------------------------------------------------------
  3045 +#------------------------------------------------------
  3090 +# DESCRIPTION OF THE RULES TO REMIND ME OF HOW THIS FILE WORKS
  3046 +# DESCRIPTION OF THE RULES TO REMIND ME OF HOW THIS FILE WORKS
  3091 +#
  3047 +#
  3092 +# If you set 'allow', this means that our mail server will allow
  3048 +# If you set 'allow', this means that our mail server will allow