Update to 2.22

Feature safe:	yes

2 files changed, 9 insertions, 19 deletions

diff --git a/misc/ddate/files/patch-configure b/misc/ddate/files/patch-configure
deleted file mode 100644
index 474e28ceb6dc..000000000000
--- a/misc/ddate/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./configure.orig	2012-03-07 11:14:14.000000000 +0100
-+++ ./configure	2012-03-07 11:16:07.000000000 +0100
-@@ -19695,8 +19695,9 @@
- ac_config_headers="$ac_config_headers config.h"
- 
- 
--ac_config_files="$ac_config_files disk-utils/Makefile fdisk/Makefile fsck/Makefile getopt/Makefile hwclock/Makefile include/Makefile lib/Makefile login-utils/Makefile Makefile man/ru/Makefile misc-utils/chkdupexe:misc-utils/chkdupexe.pl misc-utils/Makefile mount/Makefile partx/Makefile po/Makefile.in schedutils/Makefile libblkid/blkid.pc libblkid/Makefile libblkid/docs/Makefile libblkid/docs/version.xml libblkid/src/Makefile libblkid/src/blkid.h libblkid/src/superblocks/Makefile libblkid/src/topology/Makefile libblkid/src/partitions/Makefile libblkid/samples/Makefile libmount/mount.pc libmount/Makefile libmount/src/Makefile libmount/src/libmount.h libmount/docs/Makefile libmount/docs/version.xml libuuid/uuid.pc libuuid/Makefile libuuid/man/Makefile libuuid/src/Makefile sys-utils/Makefile term-utils/Makefile tests/commands.sh tests/helpers/Makefile tests/Makefile text-utils/Makefile"
-+#ac_config_files="$ac_config_files disk-utils/Makefile fdisk/Makefile fsck/Makefile getopt/Makefile hwclock/Makefile include/Makefile lib/Makefile login-utils/Makefile Makefile man/ru/Makefile misc-utils/chkdupexe:misc-utils/chkdupexe.pl misc-utils/Makefile mount/Makefile partx/Makefile po/Makefile.in schedutils/Makefile libblkid/blkid.pc libblkid/Makefile libblkid/docs/Makefile libblkid/docs/version.xml libblkid/src/Makefile libblkid/src/blkid.h libblkid/src/superblocks/Makefile libblkid/src/topology/Makefile libblkid/src/partitions/Makefile libblkid/samples/Makefile libmount/mount.pc libmount/Makefile libmount/src/Makefile libmount/src/libmount.h libmount/docs/Makefile libmount/docs/version.xml libuuid/uuid.pc libuuid/Makefile libuuid/man/Makefile libuuid/src/Makefile sys-utils/Makefile term-utils/Makefile tests/commands.sh tests/helpers/Makefile tests/Makefile text-utils/Makefile"
- 
-+ac_config_files="$ac_config_files include/Makefile lib/Makefile misc-utils/Makefile"
- 
- 
- cat >confcache <<\_ACEOF
diff --git a/misc/ddate/files/patch-misc-utils__ddate.c b/misc/ddate/files/patch-misc-utils__ddate.c
index a5399e54fd11..241cb580a3eb 100644
--- a/misc/ddate/files/patch-misc-utils__ddate.c
+++ b/misc/ddate/files/patch-misc-utils__ddate.c
@@ -1,21 +1,24 @@
---- ./misc-utils/ddate.c.orig	2011-12-18 21:29:45.802837000 +0100
-+++ ./misc-utils/ddate.c	2012-03-07 11:19:23.000000000 +0100
-@@ -51,7 +51,7 @@
+--- ./misc-utils/ddate.c.orig	2012-07-23 23:21:56.336319000 +0200
++++ ./misc-utils/ddate.c	2012-11-23 21:47:57.000000000 +0100
+@@ -51,7 +51,9 @@
   * Church of the SubGenius and do not wish your copy of ddate(1) to contain
   * code for counting down to X-Day, undefine KILL_BOB */
  
--#define KILL_BOB 13013
-+/* #define KILL_BOB 13013 */
++/*
+ #define KILL_BOB 13013
++*/
  
  /* If you wish ddate(1) to contain SubGenius slogans, define PRAISE_BOB */
  
-@@ -62,8 +62,9 @@
+@@ -62,9 +64,10 @@
  #include <time.h>
  #include <stdio.h>
  
 -#include "nls.h"
+-#include "closestream.h"
 -#include "c.h"
 +#include "../include/nls.h"
++#include "../include/closestream.h"
 +#include "../include/c.h"
 +#include "../config.h"