Restore proper documentation in patches.

3 files changed, 41 insertions, 16 deletions

diff --git a/sys-process/acct/ChangeLog b/sys-process/acct/ChangeLog
index 455d4d504eeb..ebaf57a935a3 100644
--- a/sys-process/acct/ChangeLog
+++ b/sys-process/acct/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/acct
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/ChangeLog,v 1.75 2014/08/14 12:51:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/ChangeLog,v 1.76 2014/11/08 09:53:34 vapier Exp $
+
+  08 Nov 2014; Mike Frysinger <vapier@gentoo.org>
+  files/acct-6.6.1-cross-compile.patch, files/acct-6.6.1-no-gets.patch:
+  Restore proper documentation in patches.
 
   14 Aug 2014; Mike Frysinger <vapier@gentoo.org> files/acct-6.6.1-math.patch:
   Fix copy & paste fail #519552 by René Rhéaume.
diff --git a/sys-process/acct/files/acct-6.6.1-cross-compile.patch b/sys-process/acct/files/acct-6.6.1-cross-compile.patch
index 4dbfcfb33ebc..67ac7d56fad0 100644
--- a/sys-process/acct/files/acct-6.6.1-cross-compile.patch
+++ b/sys-process/acct/files/acct-6.6.1-cross-compile.patch
@@ -1,6 +1,19 @@
-diff -uNr acct-6.6.1.ORIG/configure.ac acct-6.6.1/configure.ac
---- acct-6.6.1.ORIG/configure.ac	2013-10-10 20:00:31.581225736 +0100
-+++ acct-6.6.1/configure.ac	2013-10-10 20:03:42.393231583 +0100
+https://savannah.gnu.org/patch/?7473
+
+From 8958c3cb7b77ec50d8dae0490d8c80dee798e20d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Fri, 18 Feb 2011 06:13:20 +0100
+Subject: [PATCH] Don't generate files.h at build-time using an execution test.
+
+The *_LOC variables are never used in the build itself, but only in the
+built code; this means that they don't need to be known to ./configure at
+all.
+
+Since the previous method made acct not cross-compilable at all, this is
+much preferred.
+
+--- acct-6.6.1/configure.ac
++++ acct-6.6.1/configure.ac
 @@ -228,102 +228,6 @@
  		AC_EGREP_HEADER([comp_t],[sys/acct.h],[AC_DEFINE(HAVE_COMP_T, 1, Define if <sys/acct.h> uses the COMP_T type.)])
    ) ]
@@ -118,9 +131,8 @@ diff -uNr acct-6.6.1.ORIG/configure.ac acct-6.6.1/configure.ac
 -AC_CONFIG_FILES([Makefile lib/Makefile files.h version.h])
 +AC_CONFIG_FILES([Makefile lib/Makefile version.h])
  AC_OUTPUT
-diff -uNr acct-6.6.1.ORIG/files.h acct-6.6.1/files.h
---- acct-6.6.1.ORIG/files.h	1970-01-01 01:00:00.000000000 +0100
-+++ acct-6.6.1/files.h	2013-10-10 20:01:36.314227720 +0100
+--- acct-6.6.1/files.h
++++ acct-6.6.1/files.h
 @@ -0,0 +1,123 @@
 +/* files.h
 + *
@@ -245,9 +257,8 @@ diff -uNr acct-6.6.1.ORIG/files.h acct-6.6.1/files.h
 +#endif
 +
 +#endif /* ! FILES_H */
-diff -uNr acct-6.6.1.ORIG/files.h.in acct-6.6.1/files.h.in
---- acct-6.6.1.ORIG/files.h.in	2013-10-10 20:00:31.584225736 +0100
-+++ acct-6.6.1/files.h.in	1970-01-01 01:00:00.000000000 +0100
+--- acct-6.6.1/files.h.in
++++ acct-6.6.1/files.h.in
 @@ -1,48 +0,0 @@
 -/* files.h.in
 - *
@@ -297,9 +308,8 @@ diff -uNr acct-6.6.1.ORIG/files.h.in acct-6.6.1/files.h.in
 -#endif
 -
 -#endif /* ! FILES_H */
-diff -uNr acct-6.6.1.ORIG/Makefile.am acct-6.6.1/Makefile.am
---- acct-6.6.1.ORIG/Makefile.am	2013-10-10 20:00:31.585225736 +0100
-+++ acct-6.6.1/Makefile.am	2013-10-10 20:01:36.313227720 +0100
+--- acct-6.6.1/Makefile.am
++++ acct-6.6.1/Makefile.am
 @@ -66,11 +66,6 @@
  SYS_AC = @SYS_AC@
  SYS_SA = @SYS_SA@
diff --git a/sys-process/acct/files/acct-6.6.1-no-gets.patch b/sys-process/acct/files/acct-6.6.1-no-gets.patch
index 6362122b7ca5..f2f83975d587 100644
--- a/sys-process/acct/files/acct-6.6.1-no-gets.patch
+++ b/sys-process/acct/files/acct-6.6.1-no-gets.patch
@@ -1,6 +1,17 @@
-diff -uNr acct-6.6.1.ORIG/lib/stdio.in.h acct-6.6.1/lib/stdio.in.h
---- acct-6.6.1.ORIG/lib/stdio.in.h	2013-10-10 20:06:21.740236465 +0100
-+++ acct-6.6.1/lib/stdio.in.h	2013-10-10 20:08:09.969239782 +0100
+hack until acct pulls a newer gnulib version
+
+From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
+From: Eric Blake <eblake@redhat.com>
+Date: Thu, 29 Mar 2012 13:30:41 -0600
+Subject: [PATCH] stdio: don't assume gets any more
+
+Gnulib intentionally does not have a gets module, and now that C11
+and glibc have dropped it, we should be more proactive about warning
+any user on a platform that still has a declaration of this dangerous
+interface.
+
+--- acct-6.6.1/lib/stdio.in.h
++++ acct-6.6.1/lib/stdio.in.h
 @@ -699,10 +699,6 @@
     so any use of gets warrants an unconditional warning; besides, C11
     removed it.  */