diff -u ssmtp-2.61/debian/changelog ssmtp-2.61/debian/changelog --- ssmtp-2.61/debian/changelog +++ ssmtp-2.61/debian/changelog @@ -1,3 +1,10 @@ +ssmtp (2.61-12ubuntu1) gutsy; urgency=low + + * Addded password-handling patch, now smtp authentication + allows the use of ":" . (LP: #86425) + + -- Andrea Veri Mon, 11 Jun 2007 11:30:55 +0200 + ssmtp (2.61-12) unstable; urgency=low * Updated Russian Debconf translation. (Closes: #414081) diff -u ssmtp-2.61/debian/control ssmtp-2.61/debian/control --- ssmtp-2.61/debian/control +++ ssmtp-2.61/debian/control @@ -3,7 +3,7 @@ Priority: extra Maintainer: Anibal Monsalve Salazar Uploaders: Santiago Ruano Rincón -Build-Depends: po-debconf, libgnutls-dev +Build-Depends: po-debconf, libgnutls-dev, dpatch Standards-Version: 3.7.2 Package: ssmtp diff -u ssmtp-2.61/debian/rules ssmtp-2.61/debian/rules --- ssmtp-2.61/debian/rules +++ ssmtp-2.61/debian/rules @@ -7,12 +7,16 @@ CC=gcc CFLAGS=-O2 -g -Wall +include /usr/share/dpatch/dpatch.make + do_cfg: test -f Makefile || ./configure --exec-prefix="/usr" --prefix="" --enable-ssl --enable-inet6 --enable-md5auth --with-cflags="$(CFLAGS)" -build: do_cfg +build: build-stamp do_cfg make +build-stamp: patch-stamp + binary: binary-arch binary-indep binary-arch: checkroot configure build @@ -72,7 +76,7 @@ binary-indep: -clean: +clean: unpatch test \! -f Makefile || make distclean -rm -rf debian/tmp -rm -f debian/{files,substvars} only in patch2: unchanged: --- ssmtp-2.61.orig/debian/patches/00list +++ ssmtp-2.61/debian/patches/00list @@ -0,0 +1 @@ +01_password-handling only in patch2: unchanged: --- ssmtp-2.61.orig/debian/patches/01_password-handling.dpatch +++ ssmtp-2.61/debian/patches/01_password-handling.dpatch @@ -0,0 +1,40 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## password-handling.diff.dpatch by Andrea Veri +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ + +--- ssmtp-2.61/ssmtp.c 2007-02-19 23:16:03.000000000 -0600 ++++ ssmtp-fixed.c 2007-02-19 23:17:59.000000000 -0600 +@@ -881,7 +881,7 @@ bool_t read_config() + p=firsttok(&begin, "= \t\n"); + if(p){ + rightside=begin; +- q = firsttok(&begin, "= \t\n:"); ++ q = firsttok(&begin, "= \t\n"); + } + if(p && q) { + if(strcasecmp(p, "Root") == 0) { +@@ -894,15 +894,15 @@ bool_t read_config() + } + } + else if(strcasecmp(p, "MailHub") == 0) { ++ if((r = strchr(q, ':')) != NULL) { ++ *r++ = '\0'; ++ port = atoi(r); ++ } ++ + if((mailhost = strdup(q)) == (char *)NULL) { + die("parse_config() -- strdup() failed"); + } + +- if((r = firsttok(&begin, "= \t\n:")) != NULL) { +- port = atoi(r); +- free(r); +- } +- + if(log_level > 0) { + log_event(LOG_INFO, "Set MailHub=\"%s\"\n", mailhost); + log_event(LOG_INFO, "Set RemotePort=\"%d\"\n", port);