From 05b58e224d9bc39d4b88c16f1358da675c94f6e7 Mon Sep 17 00:00:00 2001
From: Fredrik Rinnestam <fredrik@crux.nu>
Date: Fri, 23 May 2014 17:56:35 +0200
Subject: [PATCH 1/2] grep: updated to 2.19

---
 grep/.md5sum | 2 +-
 grep/Pkgfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/grep/.md5sum b/grep/.md5sum
index 6bd31c9e..e76df624 100644
--- a/grep/.md5sum
+++ b/grep/.md5sum
@@ -1 +1 @@
-7439f8266f50844b56cc3e2721606541  grep-2.18.tar.xz
+ac732142227d9fe9567d71301e127979  grep-2.19.tar.xz
diff --git a/grep/Pkgfile b/grep/Pkgfile
index 7fa5c550..4839468c 100644
--- a/grep/Pkgfile
+++ b/grep/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  libpcre
 
 name=grep
-version=2.18
+version=2.19
 release=1
 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.xz)
 

From 86201200b8560490f16ab1263c0093c356b59dfd Mon Sep 17 00:00:00 2001
From: Fredrik Rinnestam <fredrik@crux.nu>
Date: Wed, 28 May 2014 19:35:16 +0200
Subject: [PATCH 2/2] [notify] exim: updated to 4.82.1. Resolves CVE-2014-2957

core/exim is not vulnerable to this issue. We dont build with
EXPERIMENTAL_DMARC. See
http://www.openwall.com/lists/oss-security/2014/05/28/3.
---
 exim/.footprint                | 4 ++--
 exim/.md5sum                   | 4 ++--
 exim/Pkgfile                   | 2 +-
 exim/exim-compile_number.patch | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/exim/.footprint b/exim/.footprint
index b702a28a..575c7f1d 100644
--- a/exim/.footprint
+++ b/exim/.footprint
@@ -6,7 +6,7 @@ drwxr-xr-x	root/root	etc/rc.d/
 -rwxr-xr-x	root/root	etc/rc.d/exim
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
-lrwxrwxrwx	root/root	usr/bin/mailq -> ../sbin/exim-4.82-1
+lrwxrwxrwx	root/root	usr/bin/mailq -> ../sbin/exim-4.82.1-1
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man8/
 -rw-r--r--	root/root	usr/man/man8/exim.8.gz
@@ -27,7 +27,7 @@ lrwxrwxrwx	root/root	usr/sbin/exim -> exim-4.82-1
 -rwxr-xr-x	root/root	usr/sbin/exiqgrep
 -rwxr-xr-x	root/root	usr/sbin/exiqsumm
 -rwxr-xr-x	root/root	usr/sbin/exiwhat
-lrwxrwxrwx	root/root	usr/sbin/sendmail -> exim-4.82-1
+lrwxrwxrwx	root/root	usr/sbin/sendmail -> exim-4.82.1-1
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/log/
 drwxr-x---	mail/mail	var/log/exim/
diff --git a/exim/.md5sum b/exim/.md5sum
index 827803ae..24c697f6 100644
--- a/exim/.md5sum
+++ b/exim/.md5sum
@@ -1,4 +1,4 @@
 e00ba95600b51e47d8fedb0ed24d2bf3  exim
-feb933baa4db773c2ef76b794c60b647  exim-4.82.tar.bz2
-92fd6587c9c7c80ebc3bac6063943d90  exim-compile_number.patch
+4544696ce6689ba9141a0697f25a74cb  exim-4.82.1.tar.bz2
+f01c2add107619cdd807ab388910edd3  exim-compile_number.patch
 10b49e3305c2dda37d6d840f6f4280ee  exim-config.patch
diff --git a/exim/Pkgfile b/exim/Pkgfile
index ea6e29e7..55778836 100644
--- a/exim/Pkgfile
+++ b/exim/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  db openssl libpcre tcp_wrappers
 
 name=exim
-version=4.82
+version=4.82.1
 release=1
 source=(ftp://ftp.exim.org/pub/exim/exim4/$name-$version.tar.bz2 \
         $name $name-config.patch
diff --git a/exim/exim-compile_number.patch b/exim/exim-compile_number.patch
index 2e440523..6e84fcfd 100644
--- a/exim/exim-compile_number.patch
+++ b/exim/exim-compile_number.patch
@@ -10,12 +10,12 @@ diff -Nru exim-4.82.orig/OS/Makefile-Base exim-4.82/OS/Makefile-Base
  	@../scripts/reversion
  
  cnumber.h: version.h
-diff -Nru exim-4.82.orig/src/version.sh exim-4.82/src/version.sh
---- exim-4.82.orig/src/version.sh	2013-10-28 15:29:04.751427646 +0100
-+++ exim-4.82/src/version.sh	2013-10-28 15:29:52.016435763 +0100
+--- exim-4.82.1.orig/src/version.sh	2014-05-28 19:30:19.828197324 +0200
++++ exim-4.82.1/src/version.sh	2014-05-28 19:30:50.839265749 +0200
 @@ -1,4 +1,4 @@
  # automatically generated file - see ../scripts/reversion
  EXIM_RELEASE_VERSION="4.82"
- EXIM_VARIANT_VERSION=""
+-EXIM_VARIANT_VERSION="_1-5b7a7c0-XX"
 -EXIM_COMPILE_NUMBER="1"
++EXIM_VARIANT_VERSION=""
 +EXIM_COMPILE_NUMBER="0"