[arch-commits] Commit in alpine/trunk (4 files)

[Eric Bélanger]

    Date: Friday, September 18, 2009 @ 20:56:27
  Author: eric
Revision: 52363

upgpkg: alpine 2.00-5
    Updated patchset to level 52, Security fix

Added:
  alpine/trunk/2.00-lpam.patch
  alpine/trunk/CVE-2008-5514.patch
Modified:
  alpine/trunk/ChangeLog
  alpine/trunk/PKGBUILD

---------------------+
 2.00-lpam.patch     |   13 +++++++++++++
 CVE-2008-5514.patch |   20 ++++++++++++++++++++
 ChangeLog           |    8 +++++++-
 PKGBUILD            |   27 +++++++++++++--------------
 4 files changed, 53 insertions(+), 15 deletions(-)

Added: 2.00-lpam.patch
===================================================================
--- 2.00-lpam.patch	                        (rev 0)
+++ 2.00-lpam.patch	2009-09-19 00:56:27 UTC (rev 52363)
@@ -0,0 +1,13 @@
+--- alpine-2.00.orig/alpine/Makefile.in
++++ alpine-2.00/alpine/Makefile.in
+@@ -169,7 +169,7 @@
+ LIBICONV = @LIBICONV@
+ LIBINTL = @LIBINTL@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lpam
+ LIBTOOL = @LIBTOOL@
+ LN = @LN@
+ LN_S = @LN_S@
+ LTLIBICONV = @LTLIBICONV@
+ LTLIBINTL = @LTLIBINTL@

Added: CVE-2008-5514.patch
===================================================================
--- CVE-2008-5514.patch	                        (rev 0)
+++ CVE-2008-5514.patch	2009-09-19 00:56:27 UTC (rev 52363)
@@ -0,0 +1,20 @@
+--- alpine-2.00/imap/src/c-client/rfc822.c
++++ alpine-2.00/imap/src/c-client/rfc822.c
+@@ -1351,6 +1351,7 @@
+ 
+ static long rfc822_output_char (RFC822BUFFER *buf,int c)
+ {
++  if ((buf->cur == buf->end) && !rfc822_output_flush (buf)) return NIL;
+   *buf->cur++ = c;		/* add character, soutr buffer if full */
+   return (buf->cur == buf->end) ? rfc822_output_flush (buf) : LONGT;
+ }
+@@ -1374,7 +1375,8 @@
+       len -= i;
+     }
+ 				/* soutr buffer now if full */
+-    if (len && !rfc822_output_flush (buf)) return NIL;
++    if ((len || (buf->cur == buf->end)) && !rfc822_output_flush (buf))
++      return NIL;
+   }
+   return LONGT;
+ }

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-09-18 23:58:26 UTC (rev 52362)
+++ ChangeLog	2009-09-19 00:56:27 UTC (rev 52363)
@@ -1,3 +1,9 @@
+2009-09-18  Eric Belanger  <eric at archlinux.org>
+
+	* alpine 2.00-5
+	* Updated patchset to level 52
+	* Security fix
+
 2009-09-17  Allan McRae  <allan at archlinux.org>
 
 	* alpine 2.00-4
@@ -6,7 +12,7 @@
 2009-02-07  Eric Belanger  <eric at archlinux.org>
 
 	* alpine 2.00-3
-	* Updated patchset
+	* Updated patchset to level 20
 
 2008-12-05  Eric Belanger  <eric at archlinux.org>
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-09-18 23:58:26 UTC (rev 52362)
+++ PKGBUILD	2009-09-19 00:56:27 UTC (rev 52363)
@@ -4,8 +4,8 @@
 
 pkgname=alpine
 pkgver=2.00
-pkgrel=4
-_patchlevel=20
+pkgrel=5
+_patchlevel=52
 pkgdesc="The Apache-licensed PINE (a tool for reading, sending, and managing electronic messages)"
 arch=('i686' 'x86_64')
 url="http://www.washington.edu/alpine/"
@@ -16,23 +16,22 @@
 conflicts=('pine')
 replaces=('pine')
 options=('!makeflags')
-# patch from http://staff.washington.edu/chappa/alpine/ :
-# http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/all.patch.gz
 source=(ftp://ftp.cac.washington.edu/${pkgname}/${pkgname}.tar.bz2 \
-	ftp://ftp.archlinux.org/other/$pkgname/all-${_patchlevel}.patch.gz)
-md5sums=('84e44cbf71ed674800a5d57eed9c1c52' '5952d830d64d321040b9a3c0a0e74134')
-sha1sums=('dcbd3c5419954f484ccf706feaba31ce48cdebc4' '3bc0006a5ff2bf5a67d2fc0ed390d653f5478a9b')
+        http://staff.washington.edu/chappa/alpine/patches/alpine-${pkgver}/all_${_patchlevel}.patch.gz \
+        2.00-lpam.patch CVE-2008-5514.patch)
+md5sums=('84e44cbf71ed674800a5d57eed9c1c52' '33d9fa000f896fce23cc58b56068428f'\
+         'cd3911c16fc6a072e853c0ccfc35857c' '1b52a54a656979116c09fb1d948a4325')
+sha1sums=('dcbd3c5419954f484ccf706feaba31ce48cdebc4' '1d952e652e8ccf11867af12fe6de70180e58acb1'\
+         '1b39525f91ebd5a9de5a1e04f5554f6fa5f58ae3' 'bc61d76a237ff42b00b3f60f2e6fc5c45e261dbb')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 < ../all-${_patchlevel}.patch || return 1
-
-  # -Wl,--as-needed does not work
-  export LDFLAGS=""
-
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 < ../all_${_patchlevel}.patch || return 1
+  patch -p1 < ../2.00-lpam.patch || return 1
+  patch -p1 < ../CVE-2008-5514.patch || return 1
   ./configure --prefix=/usr --without-passfile --without-tcl \
     --disable-shared --with-system-pinerc=/etc/alpine.d/pine.conf \
     --with-system-fixed-pinerc=/etc/alpine.d/pine.conf.fixed || return 1
   make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 }