From b70981b68efcce5256eb11c6cd26ae123b10b6ea Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 24 Jul 2009 08:01:31 +0000
Subject: moved extra/* to main/

and fixed misc build issues
---
 extra/ssmtp/APKBUILD              | 32 -------------------------
 extra/ssmtp/CVE-2008-3962.patch   | 14 -----------
 extra/ssmtp/generate_config.patch | 49 ---------------------------------------
 3 files changed, 95 deletions(-)
 delete mode 100644 extra/ssmtp/APKBUILD
 delete mode 100644 extra/ssmtp/CVE-2008-3962.patch
 delete mode 100644 extra/ssmtp/generate_config.patch

(limited to 'extra/ssmtp')

diff --git a/extra/ssmtp/APKBUILD b/extra/ssmtp/APKBUILD
deleted file mode 100644
index 2f63b689f..000000000
--- a/extra/ssmtp/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-#Contributor: Leonardo Arena <rnalrd@gmail.com>
-pkgname=ssmtp
-pkgver=2.62
-pkgrel=0
-pkgdesc="Extremely simple MTA to get mail off the system to a mail hub"
-subpackages="$pkgname-doc"
-arch=""
-url="http://packages.debian.org/source/lenny/ssmtp"
-license="GPL-2"
-depends="uclibc"
-makedepends="openssl-dev"
-install=
-source="http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.gz
-        CVE-2008-3962.patch
-        generate_config.patch"
-
-build() {
-	cd "$srcdir/$pkgname"
-	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
-
-	./configure --prefix=/usr \
-	--mandir=/usr/share/man \
-	--sysconfdir=/etc \
-	--enable-ssl
-	make || return 1
-	make prefix="$pkgdir"/usr etcdir="$pkgdir"/etc mandir="$pkgdir"/usr/share/man install
-}
-md5sums="257ac04e62ab7e3616e220333a1140cb  ssmtp_2.62.orig.tar.gz
-18f0686f1b8888d187f06dcff3b6212a  CVE-2008-3962.patch
-c70c395fe71589ca8b10b666455d5071  generate_config.patch"
diff --git a/extra/ssmtp/CVE-2008-3962.patch b/extra/ssmtp/CVE-2008-3962.patch
deleted file mode 100644
index fca144fa6..000000000
--- a/extra/ssmtp/CVE-2008-3962.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ssmtp.orig/ssmtp.c
-+++ ssmtp/ssmtp.c
-@@ -485,6 +485,11 @@ char *from_format(char *str, bool_t over
- 				die("from_format() -- snprintf() failed");
- 			}
- 		}
-+		else {
-+			if(snprintf(buf, BUF_SZ, "%s", str) == -1) {
-+				die("from_format() -- snprintf() failed");
-+			}
-+		}
- 	}
- 
- #if 0
diff --git a/extra/ssmtp/generate_config.patch b/extra/ssmtp/generate_config.patch
deleted file mode 100644
index dd4baf9f8..000000000
--- a/extra/ssmtp/generate_config.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- 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
-- 
cgit v1.2.3