diff options
| author | Leonardo Arena <rnalrd@gmail.com> | 2009-01-27 10:26:45 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-01-27 13:11:05 +0000 |
| commit | 11ccfb2a6b37f6f81666d67ef4c98fdd5c3e636f (patch) | |
| tree | b9f45a96669ecafb93409f66198e1238728f20f3 /testing | |
| parent | b1c08e60e047806554a40a57669287a7217f3246 (diff) | |
| download | aports-11ccfb2a6b37f6f81666d67ef4c98fdd5c3e636f.tar.bz2 aports-11ccfb2a6b37f6f81666d67ef4c98fdd5c3e636f.tar.xz | |
testing/ssmtp: hostname fix
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/ssmtp/APKBUILD | 9 | ||||
| -rw-r--r-- | testing/ssmtp/generate_config.patch | 76 |
2 files changed, 53 insertions, 32 deletions
diff --git a/testing/ssmtp/APKBUILD b/testing/ssmtp/APKBUILD index be2f4deda2..2f63b689f9 100644 --- a/testing/ssmtp/APKBUILD +++ b/testing/ssmtp/APKBUILD @@ -11,12 +11,11 @@ depends="uclibc" makedepends="openssl-dev" install= source="http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.gz - generate_config.patch - CVE-2008-3962.patch" + CVE-2008-3962.patch + generate_config.patch" build() { cd "$srcdir/$pkgname" - sed -i -e 's/hostname --fqdn/hostname -f/g' generate_config patch generate_config ../../generate_config.patch sed -i -e 's:$(CC) -o:$(CC) @LDFLAGS@ -o:' Makefile.in patch -p1 ssmtp.c ../../CVE-2008-3962.patch @@ -29,5 +28,5 @@ build() { make prefix="$pkgdir"/usr etcdir="$pkgdir"/etc mandir="$pkgdir"/usr/share/man install } md5sums="257ac04e62ab7e3616e220333a1140cb ssmtp_2.62.orig.tar.gz -d799575f8edefaa279b4cef4df55f874 generate_config.patch -18f0686f1b8888d187f06dcff3b6212a CVE-2008-3962.patch" +18f0686f1b8888d187f06dcff3b6212a CVE-2008-3962.patch +c70c395fe71589ca8b10b666455d5071 generate_config.patch" diff --git a/testing/ssmtp/generate_config.patch b/testing/ssmtp/generate_config.patch index e154310841..dd4baf9f8a 100644 --- a/testing/ssmtp/generate_config.patch +++ b/testing/ssmtp/generate_config.patch @@ -1,27 +1,49 @@ -18,34c18 -< echo "Please enter the mail name of your system." -< echo "This is the hostname portion of the address to be shown" -< echo "on outgoing news and mail messages headers." -< echo "The default is $syshostname, your system's host name." -< echo -< echo -n "Mail name [$syshostname]: " -< read mailname -< echo -< -< echo -n "Please enter the SMTP port number [25]: " -< read smtpport -< if test -z "$smtpport" -< then -< mailhub=$mailhub -< else -< mailhub="$mailhub:$smtpport" -< fi ---- -> mailhub="$mailhub:25" -61,66d44 -< -< echo -< echo -< echo "Please check the configuration file $1 for correctness." -< echo -< echo +--- src/ssmtp/generate_config 2004-07-23 05:58:48.000000000 +0000 ++++ generate_config 2009-01-27 10:09:11.000000000 +0000 +@@ -4,7 +4,7 @@ + # Figure out the system's mailname + # + +-syshostname=`hostname --fqdn` ++syshostname="localhost" + if test -f /etc/mailname + then + mailname="`head -1 /etc/mailname`" +@@ -15,23 +15,7 @@ + mailname=$syshostname + fi + +-echo "Please enter the mail name of your system." +-echo "This is the hostname portion of the address to be shown" +-echo "on outgoing news and mail messages headers." +-echo "The default is $syshostname, your system's host name." +-echo +-echo -n "Mail name [$syshostname]: " +-read mailname +-echo +- +-echo -n "Please enter the SMTP port number [25]: " +-read smtpport +-if test -z "$smtpport" +-then +- mailhub=$mailhub +-else +- mailhub="$mailhub:$smtpport" +-fi ++mailhub="$mailhub:$smtpport" + + # + # Generate configuration file +@@ -56,11 +40,5 @@ + # Where will the mail seem to come from? + #rewriteDomain=`echo -n $mailname` + # The full hostname +-hostname=`hostname --fqdn` ++#hostname="localhost" + EOF +- +-echo +-echo +-echo "Please check the configuration file $1 for correctness." +-echo +-echo |