Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/mtree/files/
Date: Sat, 04 Feb 2017 21:22:20
Message-Id: 1486243195.5e1cc1f5553c5bfed28c601d4522d263915c074d.soap@gentoo
1 commit: 5e1cc1f5553c5bfed28c601d4522d263915c074d
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Feb 3 15:12:58 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 4 21:19:55 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e1cc1f5
7
8 sys-apps/mtree: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/3791
11
12 sys-apps/mtree/files/mtree-1.5-gcc4.patch | 29 -----------------------
13 sys-apps/mtree/files/mtree-2007.4+glibc-2.8.patch | 25 -------------------
14 2 files changed, 54 deletions(-)
15
16 diff --git a/sys-apps/mtree/files/mtree-1.5-gcc4.patch b/sys-apps/mtree/files/mtree-1.5-gcc4.patch
17 deleted file mode 100644
18 index a57feed..00000000
19 --- a/sys-apps/mtree/files/mtree-1.5-gcc4.patch
20 +++ /dev/null
21 @@ -1,29 +0,0 @@
22 -Index: bootstrap-pkgsrc/digest/sha2.h
23 -===================================================================
24 ---- bootstrap-pkgsrc.orig/digest/sha2.h
25 -+++ bootstrap-pkgsrc/digest/sha2.h
26 -@@ -99,21 +99,21 @@ void SHA256_Init(SHA256_CTX *);
27 - void SHA256_Update(SHA256_CTX*, const u_int8_t*, size_t);
28 - void SHA256_Final(u_int8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*);
29 - char* SHA256_End(SHA256_CTX*, u_char *);
30 --char* SHA256_Data(const u_int8_t*, size_t, u_char *);
31 -+char* SHA256_Data(const u_char*, size_t, u_char *);
32 - char *SHA256_File(char *, char *);
33 -
34 - void SHA384_Init(SHA384_CTX*);
35 - void SHA384_Update(SHA384_CTX*, const u_int8_t*, size_t);
36 - void SHA384_Final(u_int8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*);
37 - char* SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]);
38 --char* SHA384_Data(const u_int8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH]);
39 -+char* SHA384_Data(const u_char*, size_t, char[SHA384_DIGEST_STRING_LENGTH]);
40 - char *SHA384_File(char *, char *);
41 -
42 - void SHA512_Init(SHA512_CTX*);
43 - void SHA512_Update(SHA512_CTX*, const u_int8_t*, size_t);
44 - void SHA512_Final(u_int8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*);
45 - char* SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]);
46 --char* SHA512_Data(const u_int8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH]);
47 -+char* SHA512_Data(const u_char*, size_t, char[SHA512_DIGEST_STRING_LENGTH]);
48 - char *SHA512_File(char *, char *);
49 -
50 - #endif /* SHA2_USE_INTTYPES_H */
51
52 diff --git a/sys-apps/mtree/files/mtree-2007.4+glibc-2.8.patch b/sys-apps/mtree/files/mtree-2007.4+glibc-2.8.patch
53 deleted file mode 100644
54 index 9987157..00000000
55 --- a/sys-apps/mtree/files/mtree-2007.4+glibc-2.8.patch
56 +++ /dev/null
57 @@ -1,25 +0,0 @@
58 -Index: pkgsrc/pkgtools/libnbcompat/files/nbcompat/limits.h
59 -===================================================================
60 ---- pkgsrc.orig/pkgtools/libnbcompat/files/nbcompat/limits.h
61 -+++ pkgsrc/pkgtools/libnbcompat/files/nbcompat/limits.h
62 -@@ -43,6 +43,11 @@
63 - # include <limits.h>
64 - #endif
65 -
66 -+/* Needed for glibc 2.8 */
67 -+#ifdef HAVE_SYS_PARAM_H
68 -+# include <sys/param.h>
69 -+#endif
70 -+
71 - /*
72 - * Declare functions and macros that may be missing in <limits.h>.
73 - */
74 -@@ -77,4 +82,8 @@
75 - # define UID_MAX 2147483647U /* max value for a uid_t (2^31-2) */
76 - #endif
77 -
78 -+#if !defined(ARG_MAX) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 8) )
79 -+# define ARG_MAX sysconf(_SC_ARG_MAX)
80 -+#endif
81 -+
82 - #endif /* !_NBCOMPAT_LIMITS_H_ */